Various fixes for warning level 4 with MSVC

closes #178 relates #151
USCiLab · Mar 29, 2015 · 14bc429 · 14bc429
1 parent af9454b
commit 14bc429
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 10 deletions.
diff --git a/include/cereal/archives/json.hpp b/include/cereal/archives/json.hpp
@@ -573,7 +573,7 @@ namespace cereal
       {
         search();
 
-        val = itsIteratorStack.back().value().GetInt();
+        val = static_cast<T>( itsIteratorStack.back().value().GetInt() );
         ++itsIteratorStack.back();
       }
 
@@ -585,7 +585,7 @@ namespace cereal
       {
         search();
 
-        val = itsIteratorStack.back().value().GetUint();
+        val = static_cast<T>( itsIteratorStack.back().value().GetUint() );
         ++itsIteratorStack.back();
       }
 

diff --git a/include/cereal/archives/xml.hpp b/include/cereal/archives/xml.hpp
@@ -503,13 +503,13 @@ namespace cereal
       //! Load an int8_t from the current top node (ensures we parse entire number)
       void loadValue( int8_t & value )
       {
-        int32_t val; loadValue( val ); value = val;
+        int32_t val; loadValue( val ); value = static_cast<int8_t>( val );
       }
 
       //! Load a uint8_t from the current top node (ensures we parse entire number)
       void loadValue( uint8_t & value )
       {
-        uint32_t val; loadValue( val ); value = val;
+        uint32_t val; loadValue( val ); value = static_cast<uint8_t>( val );
       }
 
       //! Loads a type best represented as an unsigned long from the current top node

diff --git a/include/cereal/cereal.hpp b/include/cereal/cereal.hpp
@@ -239,6 +239,8 @@ namespace cereal
       OutputArchive(ArchiveType * const derived) : self(derived), itsCurrentPointerId(1), itsCurrentPolymorphicTypeId(1)
       { }
 
+      OutputArchive & operator=( OutputArchive const & ) = delete;
+
       //! Serializes all passed in data
       /*! This is the primary interface for serializing data with an archive */
       template <class ... Types> inline
@@ -586,6 +588,8 @@ namespace cereal
         itsPolymorphicTypeMap(),
         itsVersionedTypes()
       { }
+
+      InputArchive & operator=( InputArchive const & ) = delete;
 
       //! Serializes all passed in data
       /*! This is the primary interface for serializing data with an archive */

diff --git a/include/cereal/details/helpers.hpp b/include/cereal/details/helpers.hpp
@@ -147,6 +147,8 @@ namespace cereal
       static_assert( !std::is_base_of<detail::NameValuePairCore, T>::value,
                      "Cannot pair a name to a NameValuePair" );
 
+      NameValuePair & operator=( NameValuePair const & ) = delete;
+
     public:
       //! Constructs a new NameValuePair
       /*! @param n The name of the pair
@@ -254,6 +256,8 @@ namespace cereal
                                              T,
                                              typename std::decay<T>::type>::type;
 
+      SizeTag & operator=( SizeTag const & ) = delete;
+
     public:
       SizeTag( T && sz ) : size(std::forward<T>(sz)) {}
 
@@ -298,6 +302,8 @@ namespace cereal
     /*! @internal */
     MapItem( Key && key_, Value && value_ ) : key(std::forward<Key>(key_)), value(std::forward<Value>(value_)) {}
 
+    MapItem & operator=( MapItem const & ) = delete;
+
     KeyType key;
     ValueType value;
 

diff --git a/include/cereal/external/rapidjson/genericstream.h b/include/cereal/external/rapidjson/genericstream.h
@@ -5,6 +5,13 @@
 #include "rapidjson.h"
 #include <iostream>
 
+#ifdef _MSC_VER
+  #pragma warning(push)
+  #pragma warning(disable: 4127) // conditional expression is constant
+  #pragma warning(disable: 4512) // assignment operator could not be generated
+  #pragma warning(disable: 4100) // unreferenced formal parameter
+#endif
+
 namespace rapidjson {
 
   //! Wrapper of std::istream for input.
@@ -91,4 +98,8 @@ namespace rapidjson {
 
 } // namespace rapidjson
 
+// On MSVC, restore warnings state
+#ifdef _MSC_VER
+    #pragma warning(pop)
+#endif
 #endif // RAPIDJSON_GENERICSTREAM_H_
diff --git a/include/cereal/external/rapidjson/reader.h b/include/cereal/external/rapidjson/reader.h
@@ -23,6 +23,7 @@
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4127) // conditional expression is constant
+#pragma warning(disable : 4702) // uncreachable code
 #endif
 
 #ifndef RAPIDJSON_PARSE_ERROR

diff --git a/include/cereal/external/rapidxml/rapidxml.hpp b/include/cereal/external/rapidxml/rapidxml.hpp
@@ -17,6 +17,7 @@
 #ifdef _MSC_VER
     #pragma warning(push)
     #pragma warning(disable:4127)   // Conditional expression is constant
+    #pragma warning(disable:4100)   // unreferenced formal parameter
 #endif
 
 ///////////////////////////////////////////////////////////////////////////

diff --git a/include/cereal/types/memory.hpp b/include/cereal/types/memory.hpp
@@ -46,6 +46,8 @@ namespace cereal
     {
       PtrWrapper(T && p) : ptr(std::forward<T>(p)) {}
       T & ptr;
+
+      PtrWrapper & operator=( PtrWrapper const & ) = delete;
     };
 
     //! Make a PtrWrapper

diff --git a/unittests/user_data_adapters.cpp b/unittests/user_data_adapters.cpp
@@ -50,6 +50,8 @@ struct UserStruct
     ref( reference )
   { }
 
+  UserStruct & operator=( UserStruct const & ) = delete;
+
   std::int32_t i32;
   SomeStruct const * p;
   SomeStruct & ref;

diff --git a/vs2013/sandbox_vs/sandbox_vs.vcxproj b/vs2013/sandbox_vs/sandbox_vs.vcxproj
@@ -83,9 +83,10 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
+      <TreatWarningAsError>false</TreatWarningAsError>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -94,7 +95,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
     </ClCompile>
@@ -105,7 +106,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -120,7 +121,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>

diff --git a/vs2013/unittests/unittests.vcxproj b/vs2013/unittests/unittests.vcxproj
@@ -137,7 +137,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
@@ -168,7 +168,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>