Make any.hpp publicly available for external plugins

BlueBrain · Aug 27, 2019 · bb3d77c · bb3d77c
1 parent 955705a
commit bb3d77c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/brayns/common/CMakeLists.txt b/brayns/common/CMakeLists.txt
@@ -22,6 +22,7 @@ set(BRAYNSCOMMON_SOURCES
 )
 
 set(BRAYNSCOMMON_PUBLIC_HEADERS
+  any.hpp
   ActionInterface.h
   BaseObject.h
   ImageManager.h
@@ -53,14 +54,14 @@ set(BRAYNSCOMMON_PUBLIC_HEADERS
   transferFunction/TransferFunction.h
   types.h
   utils/enumUtils.h
-  utils/filesystem.h
   utils/imageUtils.h
   utils/stringUtils.h
   utils/utils.h
 )
 
 set(BRAYNSCOMMON_HEADERS
   utils/DynamicLib.h
+  utils/filesystem.h
   utils/base64/base64.h
 )
 

diff --git a/brayns/common/PropertyMap.h b/brayns/common/PropertyMap.h
@@ -22,7 +22,7 @@
 
 #include <brayns/common/types.h>
 // NOTE: Replace with std::any when upgrading to c++17
-#include <deps/any.hpp>
+#include <brayns/common/any.hpp>
 
 #include <algorithm>
 #include <functional>
@@ -284,8 +284,8 @@ class PropertyMap
     // std::vector move constructor is not noexcept until C++17, if we want
     // this class to be movable we have to do it by hand.
     PropertyMap(PropertyMap&& other) noexcept
-        : _name(std::move(other._name))
-        , _properties(std::move(other._properties))
+        : _name(std::move(other._name)),
+          _properties(std::move(other._properties))
     {
     }
     // Assignment operator valid for both copy and move assignment.

diff --git a/deps/any.hpp → brayns/common/any.hpp b/deps/any.hpp → brayns/common/any.hpp
@@ -1,3 +1,4 @@
+// clang-format off
 //
 // Implementation of N4562 std::experimental::any (merged into C++17) for C++11 compilers.
 //
@@ -470,3 +471,5 @@ namespace std
 }
 
 #endif
+
+// clang-format on