Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7514 for code


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ois_update/src/OrxonoxConfig.cmake

    r7380 r7514  
    7575ENDIF(MSVC)
    7676
     77# Part of a woraround for OS X warnings. See OrxonoxConfig.h.in
     78IF(HAVE_STDINT_H)
     79  SET(HAVE_STDINT_H 1)
     80ELSE()
     81  SET(HAVE_STDINT_H 0)
     82ENDIF()
     83
    7784# Check iso646.h include (literal operators)
    7885INCLUDE(CheckIncludeFileCXX)
  • code/branches/ois_update/src/OrxonoxConfig.h.in

    r7401 r7514  
    158158#endif
    159159
    160 #cmakedefine HAVE_STDINT_H
    161 #ifdef HAVE_STDINT_H
     160// On OS X some headers already define HAVE_STDINT_H and that spits out
     161// some warnings. Therefore we use this syntax.
     162// Note: This requires some extra code in OrxonoxConfig.cmake
     163#if @HAVE_STDINT_H@
    162164#  include <stdint.h>
    163165#elif defined(ORXONOX_COMPILER_MSVC)
  • code/branches/ois_update/src/libraries/core/command/Functor.h

    r7401 r7514  
    186186
    187187        public:
     188            virtual ~Functor() {}
     189
    188190            /// 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)
    189191            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;
     
    248250            /// Constructor: Stores the object-pointer.
    249251            FunctorMember(O* object = 0) : object_(object) {}
     252            virtual ~FunctorMember() {}
    250253
    251254            /// 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

    r7401 r7514  
    163163            public:
    164164                SharedCounter() : count_(1) {}
     165                virtual ~SharedCounter() {}
    165166                virtual void destroy() = 0;
    166167
Note: See TracChangeset for help on using the changeset viewer.