Skip to content

Commit db52591

Browse files
committed
Use __COUNTER__ instead of name for internal dummy name.
The name can be the same for different maps, for instance one mapping from object id to location and one mapping to an offset. The counter should always be unique.
1 parent 89e634d commit db52591

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

include/osmium/index/map.hpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,11 @@ namespace osmium {
285285

286286
#define REGISTER_MAP(id, value, klass, name) \
287287
namespace osmium { namespace index { namespace detail { \
288-
const bool OSMIUM_CONCATENATE_(registered_, name) = osmium::index::register_map<id, value, klass>(#name); \
289-
inline bool OSMIUM_CONCATENATE_(get_registered_, name)() noexcept { \
290-
return OSMIUM_CONCATENATE_(registered_, name); \
291-
} \
288+
namespace OSMIUM_CONCATENATE_(register_map_, __COUNTER__) { \
289+
const bool registered = osmium::index::register_map<id, value, klass>(#name); \
290+
inline bool get_registered() noexcept { \
291+
return registered; \
292+
} } \
292293
} } }
293294

294295
} // namespace index

0 commit comments

Comments
 (0)