diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-02-06 15:31:07 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-02-06 15:38:05 +0100 |
commit | 4292482aeb20b55523dabf5f61645b949f547578 (patch) | |
tree | c2d3eebfb469c1ea7c399ea7cbef4260dd1bc780 /fsa | |
parent | 84efae0efef5d63f176cb04547c0ddf543081c82 (diff) |
Eliminate clang warning in fsa
Diffstat (limited to 'fsa')
-rw-r--r-- | fsa/src/apps/fsadump/fsadump.cpp | 4 | ||||
-rw-r--r-- | fsa/src/vespa/fsa/automaton.cpp | 4 | ||||
-rw-r--r-- | fsa/src/vespa/fsa/conceptnet.cpp | 6 | ||||
-rw-r--r-- | fsa/src/vespa/fsa/fsa.cpp | 4 | ||||
-rw-r--r-- | fsa/src/vespa/fsa/fsa.h | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/fsa/src/apps/fsadump/fsadump.cpp b/fsa/src/apps/fsadump/fsadump.cpp index 9e488d5bb74..16e128f33ca 100644 --- a/fsa/src/apps/fsadump/fsadump.cpp +++ b/fsa/src/apps/fsadump/fsadump.cpp @@ -154,11 +154,11 @@ int main(int argc, char** argv) break; case 2: case 3: - num_meta = *((const uint16_t*)it->data()); + num_meta = *((const uint16_t*)(const void *)it->data()); break; case 4: default: - num_meta = *((const uint32_t*)it->data()); + num_meta = *((const uint32_t*)(const void *)it->data()); break; } std::cout << it->str() << '\t' << num_meta << '\n'; diff --git a/fsa/src/vespa/fsa/automaton.cpp b/fsa/src/vespa/fsa/automaton.cpp index b357042b4d1..5d46a994272 100644 --- a/fsa/src/vespa/fsa/automaton.cpp +++ b/fsa/src/vespa/fsa/automaton.cpp @@ -349,12 +349,12 @@ void Automaton::PackedAutomaton::finalize() std::map<uint32_t,uint32_t> bcomp; std::map<uint32_t,uint32_t>::iterator bcomp_it; bcomp[0]=0; - uint32_t lastsize = *((uint32_t*)_blob), currsize; + uint32_t lastsize = *((uint32_t*)(void *)_blob), currsize; uint32_t i=lastsize+sizeof(uint32_t); uint32_t j=lastsize; bool fixedsize = true; while(i<_blob_used){ - currsize = *((uint32_t*)(_blob+i)); + currsize = *((uint32_t*)(void *)(_blob+i)); if(currsize!=lastsize){ fixedsize = false; break; diff --git a/fsa/src/vespa/fsa/conceptnet.cpp b/fsa/src/vespa/fsa/conceptnet.cpp index be2e098774a..4b6f5508755 100644 --- a/fsa/src/vespa/fsa/conceptnet.cpp +++ b/fsa/src/vespa/fsa/conceptnet.cpp @@ -165,7 +165,7 @@ bool ConceptNet::read(const char *datafile, FileAccessMethod fam) } } else { - _index = (UnitData*)((uint8_t*)_mmap_addr + sizeof(header)); + _index = (UnitData*)(void *)((uint8_t*)_mmap_addr + sizeof(header)); } // read _info @@ -179,7 +179,7 @@ bool ConceptNet::read(const char *datafile, FileAccessMethod fam) } } else { - _info = (uint32_t*)((uint8_t*)_index + _index_size*sizeof(UnitData)); + _info = (uint32_t*)(void *)((uint8_t*)_index + _index_size*sizeof(UnitData)); } // read _catindex @@ -193,7 +193,7 @@ bool ConceptNet::read(const char *datafile, FileAccessMethod fam) } } else { - _catindex = (uint32_t*)((uint8_t*)_info + _info_size*sizeof(uint32_t)); + _catindex = (uint32_t*)(void *)((uint8_t*)_info + _info_size*sizeof(uint32_t)); } // read _strings diff --git a/fsa/src/vespa/fsa/fsa.cpp b/fsa/src/vespa/fsa/fsa.cpp index b7343704de4..b9f7fb63b62 100644 --- a/fsa/src/vespa/fsa/fsa.cpp +++ b/fsa/src/vespa/fsa/fsa.cpp @@ -236,7 +236,7 @@ bool FSA::read(const char *file, FileAccessMethod fam) } } else { - _state = (state_t*)((uint8_t*)_mmap_addr + sizeof(header) + + _state = (state_t*)(void *)((uint8_t*)_mmap_addr + sizeof(header) + _size*sizeof(symbol_t)); } checksum += Checksum::compute(_state,_size*sizeof(state_t)); @@ -268,7 +268,7 @@ bool FSA::read(const char *file, FileAccessMethod fam) } } else { - _perf_hash = (hash_t*)((uint8_t*)_mmap_addr + sizeof(header) + + _perf_hash = (hash_t*)(void *)((uint8_t*)_mmap_addr + sizeof(header) + _size*sizeof(symbol_t) + _size*sizeof(state_t) + _data_size); diff --git a/fsa/src/vespa/fsa/fsa.h b/fsa/src/vespa/fsa/fsa.h index 621e4a03c2b..072dc1de4bd 100644 --- a/fsa/src/vespa/fsa/fsa.h +++ b/fsa/src/vespa/fsa/fsa.h @@ -612,10 +612,10 @@ public: return (uint32_t)((const uint8_t*)da)[0]; case 2: case 3: - return (uint32_t)((const uint16_t*)da)[0]; + return (uint32_t)((const uint16_t*)(const void *)da)[0]; case 4: default: - return ((const uint32_t*)da)[0]; + return ((const uint32_t*)(const void *) da)[0]; } } @@ -2203,7 +2203,7 @@ public: if(_data_type==DATA_FIXED) return _fixed_data_size; else - return (int)(*((uint32_t*)(_data+_state[fs+FINAL_SYMBOL]))); + return (int)(*((uint32_t*)(void *)(_data+_state[fs+FINAL_SYMBOL]))); } return -1; } |