Changeset 729 for code/branches/FICN/src/orxonox/OrxonoxPlatform.h

Timestamp:

Dec 30, 2007, 9:48:52 PM (18 years ago)

Author:

rgrieder

Message:

• fixed multiple template instantiation problem under windows
• removed some warnings by introducing explicit casts

File:

• code/branches/FICN/src/orxonox/OrxonoxPlatform.h (modified) (2 diffs)

code/branches/FICN/src/orxonox/OrxonoxPlatform.h

@@ -116 +116 @@
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
 
-// If we're not including this from a client build, specify that the stuff
-// should get exported. Otherwise, import it.
-#        if defined( ORXONOX_STATIC_LIB )
-     // don't use exports/imports when building statically
-#    define _OrxonoxExport
-#    define _OrxonoxPrivate
-#  else
-#    if defined( ORXONOX_NONCLIENT_BUILD )
-#      define _OrxonoxExport __declspec( dllexport )
-#    else
-#      if defined( __MINGW32__ )
-#        define _OrxonoxExport
-#      else
-#               define _OrxonoxExport __declspec( dllimport )
-#      endif
-#    endif
-#    define _OrxonoxPrivate
-#  endif
 // Win32 compilers use _DEBUG for specifying debug builds.
 #  ifdef _DEBUG
@@ -162 +144 @@
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_LINUX || ORXONOX_PLATFORM == ORXONOX_PLATFORM_APPLE
 
-// Enable GCC symbol visibility
-#  if defined( ORXONOX_GCC_VISIBILITY )
-#    define _OrxonoxExport  __attribute__ ((visibility("default")))
-#    define _OrxonoxPrivate __attribute__ ((visibility("hidden")))
-#  else
-#    define _OrxonoxExport
-#    define _OrxonoxPrivate
-#  endif
 
 // A quick define to overcome different names for the same function