refactor: Update Converter class to use atomic for g_osm_id

OPTITOOL · Aug 2, 2024 · bd79c34 · bd79c34
1 parent ed52629
commit bd79c34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/plugins/navteq/converter/Converter.cpp b/plugins/navteq/converter/Converter.cpp
@@ -9,7 +9,7 @@
 #include <osmium/osm/types.hpp>
 #include <unicode/unistr.h>
 
-osmium::unsigned_object_id_type Converter::g_osm_id = 1;
+std::atomic<osmium::unsigned_object_id_type> Converter::g_osm_id = 0;
 
 std::map<std::string, std::string> Converter::lang_code_map;
 

diff --git a/plugins/navteq/converter/Converter.hpp b/plugins/navteq/converter/Converter.hpp
@@ -17,6 +17,7 @@
 #ifndef CONVERTER_HPP
 #define CONVERTER_HPP
 
+#include <atomic>
 #include <filesystem>
 #include <map>
 #include <ogrsf_frmts.h>
@@ -122,7 +123,7 @@ class Converter {
              osmium::builder::NodeBuilder &builder);
 
   template <typename T> void setObjectProperties(T &builder) {
-    builder.object().set_id(g_osm_id++);
+    builder.object().set_id(++g_osm_id);
     set_dummy_osm_object_attributes(builder.object());
     builder.set_user(USER.data());
   }
@@ -174,7 +175,7 @@ class Converter {
   static constexpr std::string_view YES = "yes";
   static constexpr std::string_view NO = "no";
 
-  static osmium::unsigned_object_id_type g_osm_id;
+  static std::atomic<osmium::unsigned_object_id_type> g_osm_id;
 
   static constexpr std::string_view FEAT_COD = "FEAT_COD";
   static constexpr std::string_view POLYGON_NM = "POLYGON_NM";