Merge branch 'kallehuttunen-arm_fixes' into develop

see #257
USCiLab · Mar 1, 2016 · 4c9286e · 4c9286e
2 parents 7ea8da1 + 61c8e14
commit 4c9286e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,7 +40,7 @@ include_directories(./include)
 find_package(Boost COMPONENTS serialization unit_test_framework)
 
 if(Boost_FOUND)
-  include_directories(${Boost_INCLUDE_DIRS})
+  include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
   enable_testing()
   add_subdirectory(unittests)
 endif(Boost_FOUND)

diff --git a/include/cereal/archives/json.hpp b/include/cereal/archives/json.hpp
@@ -656,14 +656,14 @@ namespace cereal
       //! Serialize a long if it would not be caught otherwise
       template <class T> inline
       typename std::enable_if<std::is_same<T, long>::value &&
-                              !std::is_same<T, std::int32_t>::value &&
+                              sizeof(T) >= sizeof(std::int64_t) &&
                               !std::is_same<T, std::int64_t>::value, void>::type
       loadValue( T & t ){ loadLong(t); }
 
       //! Serialize an unsigned long if it would not be caught otherwise
       template <class T> inline
       typename std::enable_if<std::is_same<T, unsigned long>::value &&
-                              !std::is_same<T, std::uint32_t>::value &&
+                              sizeof(T) >= sizeof(std::uint64_t) &&
                               !std::is_same<T, std::uint64_t>::value, void>::type
       loadValue( T & t ){ loadLong(t); }
       #endif // _MSC_VER

diff --git a/include/cereal/archives/xml.hpp b/include/cereal/archives/xml.hpp
@@ -531,6 +531,7 @@ namespace cereal
       //! Loads a type best represented as an unsigned long from the current top node
       template <class T, traits::EnableIf<std::is_unsigned<T>::value,
                                           !std::is_same<T, bool>::value,
+                                          !std::is_same<T, char>::value,
                                           !std::is_same<T, unsigned char>::value,
                                           sizeof(T) < sizeof(long long)> = traits::sfinae> inline
       void loadValue( T & value )