Changeset 11002 for code/branches/cpp11_v2/src/libraries/network

Timestamp:

Dec 30, 2015, 9:13:14 PM (8 years ago)

Author:

landauf

Message:

MultiType now supports strongly typed enum classes. Their values are cast to the underlying type.
MultiType now also uses additional static_asserts to ensure that it is only used with supported values.

File:

• code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h (modified) (3 diffs)

code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h

@@ -207 +207 @@
   {
     template <class T, bool = std::is_enum<T>::value>
-    struct RealType;
+    struct UnderlyingType;
     template <class T>
-    struct RealType<T, true> { typedef typename std::underlying_type<T>::type type; };
+    struct UnderlyingType<T, true> { typedef typename std::underlying_type<T>::type type; };
     template <class T>
-    struct RealType<T, false> { typedef T type; };
+    struct UnderlyingType<T, false> { typedef T type; };
   }
 
@@ -217 +217 @@
   void Synchronisable::registerVariable(T& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional)
   {
-    typedef typename detail::RealType<T>::type RealType;
+    typedef typename detail::UnderlyingType<T>::type UnderlyingType;
     if (bidirectional)
     {
-      syncList_.push_back(new SynchronisableVariableBidirectional<RealType>(reinterpret_cast<RealType&>(variable), mode, cb));
+      syncList_.push_back(new SynchronisableVariableBidirectional<UnderlyingType>(reinterpret_cast<UnderlyingType&>(variable), mode, cb));
       this->dataSize_ += syncList_.back()->getSize(state_);
     }
     else
     {
-      syncList_.push_back(new SynchronisableVariable<RealType>(reinterpret_cast<RealType&>(variable), mode, cb));
+      syncList_.push_back(new SynchronisableVariable<UnderlyingType>(reinterpret_cast<UnderlyingType&>(variable), mode, cb));
       if ( this->state_ == mode )
         this->dataSize_ += syncList_.back()->getSize(state_);
@@ -255 +255 @@
   void Synchronisable::registerVariable( std::set<T>& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional)
   {
-    typedef typename detail::RealType<T>::type RealType;
+    typedef typename detail::UnderlyingType<T>::type UnderlyingType;
     SynchronisableVariableBase* sv;
     if (bidirectional)
-      sv = new SynchronisableVariableBidirectional<std::set<RealType>>(reinterpret_cast<std::set<RealType>&>(variable), mode, cb);
+      sv = new SynchronisableVariableBidirectional<std::set<UnderlyingType>>(reinterpret_cast<std::set<UnderlyingType>&>(variable), mode, cb);
     else
-      sv = new SynchronisableVariable<std::set<RealType>>(reinterpret_cast<std::set<RealType>&>(variable), mode, cb);
+      sv = new SynchronisableVariable<std::set<UnderlyingType>>(reinterpret_cast<std::set<UnderlyingType>&>(variable), mode, cb);
     syncList_.push_back(sv);
     stringList_.push_back(sv);