|
Line
Link Here
|
| 0 |
-- a/src/core/CLucene/util/VoidMap.h |
0 |
++ b/src/core/CLucene/util/VoidMap.h |
|
Lines 11-18
Link Here
|
| 11 |
#include "CLucene/LuceneThreads.h" |
11 |
#include "CLucene/LuceneThreads.h" |
| 12 |
|
12 |
|
| 13 |
#if defined(_CL_HAVE_TR1_UNORDERED_MAP) && defined(_CL_HAVE_TR1_UNORDERED_SET) |
13 |
#if defined(_CL_HAVE_TR1_UNORDERED_MAP) && defined(_CL_HAVE_TR1_UNORDERED_SET) |
|
|
14 |
#if defined(_LIBCPP_VERSION) |
| 15 |
#include <unordered_map> |
| 16 |
#include <unordered_set> |
| 17 |
#else |
| 14 |
#include <tr1/unordered_map> |
18 |
#include <tr1/unordered_map> |
| 15 |
#include <tr1/unordered_set> |
19 |
#include <tr1/unordered_set> |
|
|
20 |
#endif |
| 16 |
#elif defined(_CL_HAVE_HASH_MAP) && defined(_CL_HAVE_HASH_SET) |
21 |
#elif defined(_CL_HAVE_HASH_MAP) && defined(_CL_HAVE_HASH_SET) |
| 17 |
//hashing is all or nothing! |
22 |
//hashing is all or nothing! |
| 18 |
#include <hash_map> |
23 |
#include <hash_map> |
|
Lines 83-89
Link Here
|
| 83 |
_vt get( _kt k) const { |
88 |
_vt get( _kt k) const { |
| 84 |
const_iterator itr = base::find(k); |
89 |
const_iterator itr = base::find(k); |
| 85 |
if ( itr==base::end() ) |
90 |
if ( itr==base::end() ) |
| 86 |
return (_vt)NULL; |
91 |
return static_cast<_vt>(0); |
| 87 |
else |
92 |
else |
| 88 |
return itr->second; |
93 |
return itr->second; |
| 89 |
} |
94 |
} |
|
Lines 316-321
Link Here
|
| 316 |
if ( _this::dk || _this::dv ) |
321 |
if ( _this::dk || _this::dv ) |
| 317 |
_this::remove(k); |
322 |
_this::remove(k); |
| 318 |
|
323 |
|
|
|
324 |
(*this)[k] = v;; |
| 319 |
} |
325 |
} |
| 320 |
}; |
326 |
}; |
| 321 |
|
327 |
|
