Changeset 7514 for code/branches/ois_update/src

Timestamp:

Oct 9, 2010, 3:36:51 PM (14 years ago)

Author:

rgrieder

Message:

This hopefully fixes some warnings with gcc 4.0.

Location:

code/branches/ois_update/src

Files:

• OrxonoxConfig.cmake (modified) (1 diff)
• OrxonoxConfig.h.in (modified) (1 diff)
• libraries/core/command/Functor.h (modified) (2 diffs)
• libraries/util/SharedPtr.h (modified) (1 diff)

code/branches/ois_update/src/OrxonoxConfig.cmake

@@ -75 +75 @@
 ENDIF(MSVC)
 
+# Part of a woraround for OS X warnings. See OrxonoxConfig.h.in
+IF(HAVE_STDINT_H)
+  SET(HAVE_STDINT_H 1)
+ELSE()
+  SET(HAVE_STDINT_H 0)
+ENDIF()
+
 # Check iso646.h include (literal operators)
 INCLUDE(CheckIncludeFileCXX)

code/branches/ois_update/src/OrxonoxConfig.h.in

@@ -158 +158 @@
 #endif
 
-#cmakedefine HAVE_STDINT_H
-#ifdef HAVE_STDINT_H
+// On OS X some headers already define HAVE_STDINT_H and that spits out
+// some warnings. Therefore we use this syntax.
+// Note: This requires some extra code in OrxonoxConfig.cmake
+#if @HAVE_STDINT_H@
 #  include <stdint.h>
 #elif defined(ORXONOX_COMPILER_MSVC)

code/branches/ois_update/src/libraries/core/command/Functor.h

@@ -186 +186 @@
 
         public:
+            virtual ~Functor() {}
+
             /// Calls the function-pointer with up to five arguments. In case of a member-function, the assigned object-pointer is used to call the function. @return Returns the return-value of the function (if any; MT_Type::Null otherwise)
             virtual MultiType operator()(const MultiType& param1 = MT_Type::Null, const MultiType& param2 = MT_Type::Null, const MultiType& param3 = MT_Type::Null, const MultiType& param4 = MT_Type::Null, const MultiType& param5 = MT_Type::Null) = 0;
@@ -248 +250 @@
             /// Constructor: Stores the object-pointer.
             FunctorMember(O* object = 0) : object_(object) {}
+            virtual ~FunctorMember() {}
 
             /// Calls the function-pointer with up to five arguments and an object. In case of a static-function, the object can be NULL. @return Returns the return-value of the function (if any; MT_Type::Null otherwise)

code/branches/ois_update/src/libraries/util/SharedPtr.h

@@ -163 +163 @@
             public:
                 SharedCounter() : count_(1) {}
+                virtual ~SharedCounter() {}
                 virtual void destroy() = 0;