Remove own variant implementation, use C++17 std::variant instead

martinhaefner · Mar 28, 2022 · eeb6610 · eeb6610 · supersaiyanmode · May 17, 2022
1 parent 06dab86
commit eeb6610
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 451 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,8 @@ endif()
 # Reference the FindDBus module until an upstream one is available
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
+
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
 endif()

diff --git a/include/simppl/detail/holders.h b/include/simppl/detail/holders.h
@@ -2,6 +2,8 @@
 #define SIMPPL_DETAIL_HOLDERS_H
 
 
+#include <variant>
+
 #include "callinterface.h"
 
 
@@ -128,10 +130,10 @@ struct PropertyCallbackHolder
           DBusMessageIter iter;
           dbus_message_iter_init(msg.get(), &iter);
 
-          simppl::Variant<DataT> v;
+          std::variant<DataT> v;
           decode(iter, v);
 
-          that->f_(cs, *v.template get<DataT>());
+          that->f_(cs, std::get<DataT>(v));
        }
        else
           that->f_(cs, DataT());

diff --git a/include/simppl/property.h b/include/simppl/property.h
@@ -8,7 +8,7 @@
 
 namespace simppl
 {
-   
+
 namespace dbus
 {
 
@@ -67,9 +67,9 @@ struct PropertyCodec
    {
       detail::VariantSerializer(iter).operator()(t);
    }
-   
-   
-   static 
+
+
+   static
    void decode(DBusMessageIter& iter, T& t)
    {
       DBusMessageIter _iter;
@@ -78,7 +78,7 @@ struct PropertyCodec
       Codec<T>::decode(_iter, t);
 
       dbus_message_iter_next(&iter);
-   } 
+   }
 };
 
 

diff --git a/include/simppl/serverside.h b/include/simppl/serverside.h
@@ -270,9 +270,7 @@ struct BaseProperty : ServerPropertyBase
 
    const DataT& value() const
    {
-       const DataT* t = t_.template get<DataT>();
-       assert(t);
-       return *t;
+       return std::get<DataT>(t_);
    }
 
    static
@@ -283,7 +281,7 @@ struct BaseProperty : ServerPropertyBase
        // missing initialization?
        assert(!that->t_.empty());
 
-       detail::PropertyCodec<DataT>::encode(*iter, that->t_.template get<cb_type>() ? (*that->t_.template get<cb_type>())() : *that->t_.template get<DataT>());
+       detail::PropertyCodec<DataT>::encode(*iter, std::get_if<cb_type>(&that->t_) ? (std::get<cb_type>(that->t_))() : std::get<DataT>(that->t_));
    }
 
    /**
@@ -314,7 +312,7 @@ struct BaseProperty : ServerPropertyBase
 
 protected:
 
-   Variant<DataT, cb_type> t_;
+   std::variant<DataT, cb_type> t_;
 };
 
 
@@ -377,7 +375,7 @@ namespace detail
         static
         void eval(BaseProperty<DataT>& p, const DataT& d)
         {
-            if (!p.t_.template get<DataT>() || PropertyComparator<DataT, (Flags & Always ? false : true)>::compare(p.value(), d))
+            if (!std::get_if<DataT>(&p.t_) || PropertyComparator<DataT, (Flags & Always ? false : true)>::compare(p.value(), d))
             {
                 p.t_ = d;
                 p.notify(d);

diff --git a/include/simppl/stubbase.h b/include/simppl/stubbase.h
@@ -10,7 +10,6 @@
 
 #include "simppl/callstate.h"
 #include "simppl/pendingcall.h"
-#include "simppl/variant.h"
 
 #include "simppl/detail/constants.h"
 #include "simppl/detail/holders.h"