changes to the typesafe ID class

Author: gfrolov

inc/osvr/Common/SerializationTraits.h

@@ -516,7 +516,7 @@ namespace common {
         struct SimpleStructSerialization<StringID>
             : SimpleStructSerializationBase {
             template <typename F, typename T> static void apply(F &f, T &val) {
-                f(val.m_val);
+                f(val.value());
             }
         };
 

inc/osvr/Util/ID.h

@@ -48,21 +48,16 @@ template <class Tag, class impl> class ID {
     // Explicit constructor:
     explicit ID(impl val) : m_val(val) {}
 
-    // Explicit conversion to get back the impl:
-    // explicit operator impl() const { return m_val; }
-
-    // Implicit conversion to get back the impl
-    operator impl() const { return m_val; }
-
     bool empty() const { return m_val == 0xffffffff ? true : false; }
 
-    // this messes with implicit conversion (type casting)
-    /*
-    friend bool operator>(ID a, impl b) { return a.m_val > b; }
-    friend bool operator<(ID a, impl b) { return a.m_val < b; }
+    operator impl & () {return m_val; }
     friend bool operator==(ID a, ID b) { return a.m_val == b.m_val; }
     friend bool operator!=(ID a, ID b) { return a.m_val != b.m_val; }
-    */
+
+    impl& value() { return m_val; }
+    impl value() const { return m_val; }
+
+  private:
     impl m_val;
 };
 

src/osvr/Common/RegisteredStringMap.cpp

@@ -60,7 +60,7 @@ namespace common {
 
         for (auto &entry : m_regEntries) {
 
-            serializedMap[entry.first] = entry.second.m_val;
+            serializedMap[entry.first] = entry.second.value();
         }
         return serializedMap;
     }