Changeset 1729

Timestamp:

Sep 7, 2008, 10:00:35 AM (16 years ago)

Author:

rgrieder

Message:

Suppressing compiler warnings is not anymore necessary in MultiType (no inheritance with assignment operators).

Location:

code/branches/core3

Files:

• src/util/MultiType.h (modified) (2 diffs)
• visual_studio/core_properties.vsprops (modified) (1 diff)
• visual_studio/network_properties.vsprops (modified) (1 diff)
• visual_studio/orxonox_properties.vsprops (modified) (1 diff)

code/branches/core3/src/util/MultiType.h

@@ -35 +35 @@
 
 #include "Math.h"
-
-// disable annoying warning about multiple assignment operators
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
-#pragma warning(push)
-#pragma warning(disable:4522)
-#endif
 
 enum MT_Type
@@ -418 +412 @@
 inline void MultiType::setValue(const char* value)                  { if (this->value_) { this->value_->setValue(std::string(value)); } else { this->assignValue(std::string(value)); } }
 
-
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
-#pragma warning(pop)
-#endif
-
 #endif /* _MultiType_H__ */

code/branches/core3/visual_studio/core_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
+                AdditionalOptions="/MP2"
                 PreprocessorDefinitions="CORE_SHARED_BUILD"
         />

code/branches/core3/visual_studio/network_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
+                AdditionalOptions="/MP2"
                 PreprocessorDefinitions="ORXONOX_NO_EXPORTS;NETWORK_STATIC_BUILD;WIN32_LEAN_AND_MEAN"
         />

code/branches/core3/visual_studio/orxonox_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
+                AdditionalOptions="/MP2"
                 PreprocessorDefinitions="ORXONOX_NO_EXPORTS;NETWORK_STATIC_BUILD"
                 UsePrecompiledHeader="2"