8d6342c53d
- This moves var/spack/packages to var/spack/repos/builtin/packages. - Packages that did not exist in the source branch, or were changed in develop, were moved into var/spack/repos/builtin/packages as part of the integration. Conflicts: lib/spack/spack/test/unit_install.py var/spack/repos/builtin/packages/clang/package.py
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
--- old/sandbox/CMakeLists.txt
|
|
+++ new/sandbox/CMakeLists.txt
|
|
@@ -4,9 +4,11 @@
|
|
add_executable(sandbox_json sandbox_json.cpp)
|
|
add_executable(sandbox_rtti sandbox_rtti.cpp)
|
|
|
|
+if(Boost_FOUND)
|
|
add_executable(sandbox_vs sandbox_vs.cpp)
|
|
target_link_libraries(sandbox_vs sandbox_vs_dll)
|
|
include_directories(sandbox_shared_lib)
|
|
+endif(Boost_FOUND)
|
|
|
|
if(Boost_FOUND)
|
|
add_executable(performance performance.cpp)
|
|
--- old/include/cereal/types/common.hpp
|
|
+++ new/include/cereal/types/common.hpp
|
|
@@ -106,14 +106,16 @@
|
|
t = reinterpret_cast<typename common_detail::is_enum<T>::type const &>( value );
|
|
}
|
|
|
|
+#ifndef CEREAL_ENABLE_RAW_POINTER_SERIALIZATION
|
|
//! Serialization for raw pointers
|
|
/*! This exists only to throw a static_assert to let users know we don't support raw pointers. */
|
|
template <class Archive, class T> inline
|
|
void CEREAL_SERIALIZE_FUNCTION_NAME( Archive &, T * & )
|
|
{
|
|
static_assert(cereal::traits::detail::delay_static_assert<T>::value,
|
|
"Cereal does not support serializing raw pointers - please use a smart pointer");
|
|
}
|
|
+#endif
|
|
|
|
//! Serialization for C style arrays
|
|
template <class Archive, class T> inline
|