Changeset 1064 for code/trunk/src/core

Timestamp:

Apr 14, 2008, 9:39:57 PM (17 years ago)

Author:

rgrieder

Message:

• replaced all String2Number with ConvertValue
• replaced all tokenize with SubString
• dealt with warnings under msvc
• removed some warnings by placing casts
• bugfix in audio: local variable pushed into member variable std::vector
• updated StableHeaders.h

Location:

code/trunk/src/core

Files:

• CommandExecutor.h (modified) (1 diff)
• ConfigFileManager.h (modified) (1 diff)
• CoreSettings.h (modified) (1 diff)
• Factory.h (modified) (1 diff)
• Functor.h (modified) (2 diffs)
• Identifier.h (modified) (1 diff)
• IdentifierDistributor.h (modified) (1 diff)
• Language.h (modified) (1 diff)
• OutputHandler.h (modified) (1 diff)

code/trunk/src/core/CommandExecutor.h

@@ -161 +161 @@
         private:
             CommandExecutor() {}
-            CommandExecutor(const CommandExecutor& other) {}
+            CommandExecutor(const CommandExecutor& other);
             ~CommandExecutor() {}
 

code/trunk/src/core/ConfigFileManager.h

@@ -286 +286 @@
         private:
             ConfigFileManager();
-            ConfigFileManager(const ConfigFileManager& other) {}
+            ConfigFileManager(const ConfigFileManager& other);
             ~ConfigFileManager();
 

code/trunk/src/core/CoreSettings.h

@@ -61 +61 @@
 
             CoreSettings();
-            CoreSettings(const CoreSettings& other) {}
+            CoreSettings(const CoreSettings& other);
             virtual ~CoreSettings();
 

code/trunk/src/core/Factory.h

@@ -71 +71 @@
         private:
             Factory() {}                            // don't create
-            Factory(const Factory& factory) {}      // don't copy
+            Factory(const Factory& factory);        // don't copy
             ~Factory() {}                           // don't delete
 

code/trunk/src/core/Functor.h

@@ -429 +429 @@
 
 
-
+// disable annoying warning about forcing value to boolean
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(push)
+#pragma warning(disable:4100 4800)
+#endif
 
 #define CREATE_ALL_STATIC_FUNCTORS() \
@@ -465 +469 @@
 }
 
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#pragma warning(pop)
+#endif
+
 #endif /* _Functor_H__ */

code/trunk/src/core/Identifier.h

@@ -225 +225 @@
         private:
             Identifier();
-            Identifier(const Identifier& identifier) {} // don't copy
+            Identifier(const Identifier& identifier); // don't copy
             virtual ~Identifier();
             void initialize(std::set<const Identifier*>* parents);

code/trunk/src/core/IdentifierDistributor.h

@@ -53 +53 @@
         private:
             IdentifierDistributor() {};                                         // Don't create
-            IdentifierDistributor(const IdentifierDistributor& distributor) {}  // Don't copy
+            IdentifierDistributor(const IdentifierDistributor& distributor);    // Don't copy
             ~IdentifierDistributor() {}                                         // Don't delete
 

code/trunk/src/core/Language.h

@@ -123 +123 @@
         private:
             Language();
-            Language(const Language& language) {}   // don't copy
+            Language(const Language& language);     // don't copy
             virtual ~Language() {};                 // don't delete
 

code/trunk/src/core/OutputHandler.h

@@ -114 +114 @@
         private:
             explicit OutputHandler(const std::string& logfilename);
-            OutputHandler(const OutputHandler& oh) {}; // don't copy
+            OutputHandler(const OutputHandler& oh);  // don't copy
             virtual ~OutputHandler();
             std::ofstream logfile_;     //!< The logfile where the output is logged