Fix build for MSVC and clang

Author: flexferrum

CMakeLists.txt

@@ -64,7 +64,7 @@ endif()
 if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR ${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
     if (NOT UNIX)
         if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
-            set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-Wa,-mbig-obj -O1 -ftemplate-backtrace-limit=0")
+            set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-Wa,-mbig-obj -O1")
         else ()
             add_definitions(/D_CRT_SECURE_NO_WARNINGS)
         endif ()
@@ -175,7 +175,6 @@ if (JINJA2CPP_STRICT_WARNINGS)
     endif ()
 endif ()
 
-# target_compile_definitions(${LIB_TARGET_NAME} PUBLIC variant_CONFIG_SELECT_VARIANT=variant_VARIANT_NONSTD nssv_CONFIG_SELECT_STRING_VIEW=nssv_STRING_VIEW_NONSTD optional_CONFIG_SELECT_OPTIONAL=optional_OPTIONAL_NONSTD BOOST_SYSTEM_NO_DEPRECATED BOOST_ERROR_CODE_HEADER_ONLY)
 target_compile_definitions(${LIB_TARGET_NAME} PUBLIC BOOST_SYSTEM_NO_DEPRECATED BOOST_ERROR_CODE_HEADER_ONLY)
 
 set_target_properties(${LIB_TARGET_NAME} PROPERTIES

include/jinja2cpp/value.h

@@ -141,7 +141,6 @@ class GenericMap
 };
 
 using ValuesList = std::vector<Value>;
-// using ValuesMap = std::unordered_map<std::string, Value>;
 struct ValuesMap;
 struct UserCallableArgs;
 struct ParamInfo;
@@ -278,19 +277,13 @@ class Value
      *
      * @param list List of values which should be used to initialize \ref Value instance
      */
-    Value(const ValuesList& list)
-        : m_data(RecWrapper<ValuesList>(list))
-    {
-    }
+    Value(const ValuesList& list);
     /*!
      * \brief Initializing constructor from the \ref ValuesMap
      *
      * @param map Map of values which should be used to initialize \ref Value instance
      */
-    Value(const ValuesMap& map)
-        : m_data(RecWrapper<ValuesMap>(map))
-    {
-    }
+    Value(const ValuesMap& map);
     /*!
      * \brief Initializing constructor from the \ref UserCallable
      *
@@ -302,19 +295,13 @@ class Value
      *
      * @param list List of values which should be used to initialize \ref Value instance
      */
-    Value(ValuesList&& list) noexcept
-        : m_data(RecWrapper<ValuesList>(std::move(list)))
-    {
-    }
+    Value(ValuesList&& list) noexcept;
     /*!
      * \brief Initializing move constructor from the \ref ValuesMap
      *
      * @param map Map of values which should be used to initialize \ref Value instance
      */
-    Value(ValuesMap&& map) noexcept
-        : m_data(RecWrapper<ValuesMap>(std::move(map)))
-    {
-    }
+    Value(ValuesMap&& map) noexcept;
     /*!
      * \brief Initializing move constructor from the \ref UserCallable
      *
@@ -639,16 +626,31 @@ inline Value::Value(Value&& val) noexcept
 {
 }
 inline Value::~Value() = default;
-inline Value& Value::operator =(const Value&) = default;
-inline Value& Value::operator =(Value&& val) noexcept
+inline Value& Value::operator=(const Value&) = default;
+inline Value& Value::operator=(Value&& val) noexcept
 {
     if (this == &val)
         return *this;
 
     m_data.swap(val.m_data);
     return *this;
 }
-
+inline Value::Value(const ValuesMap& map)
+    : m_data(RecWrapper<ValuesMap>(map))
+{
+}
+inline Value::Value(const ValuesList& list)
+    : m_data(RecWrapper<ValuesList>(list))
+{
+}
+inline Value::Value(ValuesList&& list) noexcept
+    : m_data(RecWrapper<ValuesList>(std::move(list)))
+{
+}
+inline Value::Value(ValuesMap&& map) noexcept
+    : m_data(RecWrapper<ValuesMap>(std::move(map)))
+{
+}
 
 } // jinja2
 

include/jinja2cpp/value_ptr.hpp

@@ -596,105 +596,6 @@ struct nsvp_DECLSPEC_EMPTY_BASES compressed_ptr : Cloner, Deleter
     pointer ptr;
 };
 
-template<class T, class Cloner, class Deleter>
-struct nsvp_DECLSPEC_EMPTY_BASES new_compressed_ptr // : Cloner, Deleter
-{
-    // typedef T       element_type;
-    typedef T* pointer;
-
-    typedef Cloner cloner_type;
-    typedef Deleter deleter_type;
-
-    // Lifetime:
-
-    ~new_compressed_ptr() {}
-
-    new_compressed_ptr() nsvp_noexcept {}
-
-    explicit new_compressed_ptr(pointer p) nsvp_noexcept {}
-
-    new_compressed_ptr(new_compressed_ptr const& other) {}
-
-#if nsvp_CPP11_OR_GREATER
-    new_compressed_ptr(new_compressed_ptr&& other) nsvp_noexcept {}
-#endif
-
-    explicit new_compressed_ptr(T const& value) {}
-
-#if nsvp_CPP11_OR_GREATER
-
-    explicit new_compressed_ptr(T&& value) nsvp_noexcept {}
-
-    template<class... Args>
-    explicit new_compressed_ptr(nonstd_lite_in_place_t(T), Args&&... args)
-    {
-    }
-
-    template<class U, class... Args>
-    explicit new_compressed_ptr(nonstd_lite_in_place_t(T), std::initializer_list<U> il, Args&&... args)
-    {
-    }
-
-#endif
-
-    new_compressed_ptr(T const& value, cloner_type const& cloner) {}
-
-#if nsvp_CPP11_OR_GREATER
-    new_compressed_ptr(T&& value, cloner_type&& cloner) nsvp_noexcept {}
-#endif
-
-    new_compressed_ptr(T const& value, cloner_type const& cloner, deleter_type const& deleter) {}
-
-#if nsvp_CPP11_OR_GREATER
-    new_compressed_ptr(T&& value, cloner_type&& cloner, deleter_type&& deleter) nsvp_noexcept {}
-#endif
-
-    explicit new_compressed_ptr(cloner_type const& cloner) {}
-
-#if nsvp_CPP11_OR_GREATER
-    explicit new_compressed_ptr(cloner_type&& cloner) nsvp_noexcept {}
-#endif
-
-    explicit new_compressed_ptr(deleter_type const& deleter) {}
-
-#if nsvp_CPP11_OR_GREATER
-    explicit new_compressed_ptr(deleter_type&& deleter) nsvp_noexcept {}
-#endif
-
-    new_compressed_ptr(cloner_type const& cloner, deleter_type const& deleter) {}
-
-#if nsvp_CPP11_OR_GREATER
-    new_compressed_ptr(cloner_type&& cloner, deleter_type&& deleter) nsvp_noexcept {}
-#endif
-
-    // Observers:
-
-    pointer get() const nsvp_noexcept { return nullptr; }
-
-    cloner_type& get_cloner() nsvp_noexcept { return *this; }
-
-    deleter_type& get_deleter() nsvp_noexcept { return *this; }
-
-    // Modifiers:
-
-    pointer release() nsvp_noexcept { return nullptr; }
-
-    void reset(pointer p) nsvp_noexcept {}
-
-    void reset(T const& v) {}
-
-#if nsvp_CPP11_OR_GREATER
-    void reset(T&& v) {}
-#endif
-
-    void swap(new_compressed_ptr& other) nsvp_noexcept {}
-
-    union {
-        void* dummy;
-        pointer ptr;
-    };
-};
-
 } // namespace detail
 
 #if ! nsvp_CONFIG_NO_EXCEPTIONS