Changeset 1755 for code/trunk/src/util

Timestamp:

Sep 10, 2008, 1:37:36 AM (16 years ago)

Author:

rgrieder

Message:

merged gui back to trunk.
update the media repository!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/util/ArgReader.cc (deleted)
• src/util/ArgReader.h (deleted)
• src/util/CMakeLists.txt (modified) (1 diff)
• src/util/CRC32.h (modified) (1 diff)
• src/util/Convert.h (modified) (1 diff)
• src/util/Integers.h (copied) (copied from code/branches/gui/src/util/Integers.h)
• src/util/OrxonoxPlatform.h (modified) (7 diffs)
• src/util/Sleep.h (modified) (1 diff)
• src/util/SubString.h (modified) (1 diff)

code/trunk/src/util/CMakeLists.txt

@@ -1 +1 @@
 SET(UTIL_SRC_FILES
-  ArgReader.cc
   Clipboard.cc
   Error.cc

code/trunk/src/util/CRC32.h

@@ -30 +30 @@
 #define _Util_CRC_H__
 
+#include "UtilPrereqs.h"
 #include <iostream>
+#include "Integers.h"
 
 #define UTIL_CRC32POLY 0x04C11DB7 /* CRC-32 Polynom */
 
-void calcCRCBit(uint32_t &crc32, int bit);
+_UtilExport void calcCRCBit(uint32_t &crc32, int bit);
 
-uint32_t calcCRC(unsigned char *data, unsigned int dataLength);
+_UtilExport uint32_t calcCRC(unsigned char *data, unsigned int dataLength);
 
 

code/trunk/src/util/Convert.h

@@ -643 +643 @@
 };
 
+
+///////////////////////////
+// Static type detection //
+///////////////////////////
+
+/**
+    Template class that determines whether type T converts implicitly to type U.
+@note
+    This allows to detect type conversion at compile time.
+    From 'Modern C++ Design' (Alexandrescu 2001).
+*/
+template <class T, class U>
+class StaticConversion
+{
+    class Small { char dummy[1]; };
+    class Big   { char dummy[1024]; };
+    static Small Test(U);
+    static Big   Test(...);
+    static T MakeT();
+public:
+    enum { exists = sizeof(Test(MakeT())) == sizeof(Small) };
+};
+
 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
 #pragma warning(pop)

code/trunk/src/util/OrxonoxPlatform.h

@@ -25 +25 @@
  *      Reto Grieder
  *
+ *   Original code: OgrePlatform.h, licensed under the LGPL. The code
+ *   has changed quite a bit however.
+ *
  */
 
 /**
  @file
- @brief Various constants for compiler, architecture and platform. It's a mere
-        copy of the file found in the Ogre source code (OgrePlatform.h).
+ @brief
+    Various constants for compiler, architecture and platform.
  */
 
@@ -36 +39 @@
 #define _OrxonoxPlatform_H__
 
-/* Initial platform/compiler-related stuff to set.
-*/
+/* Initial platform/compiler-related stuff to set. */
+
 #define ORXONOX_PLATFORM_WIN32 1
 #define ORXONOX_PLATFORM_LINUX 2
@@ -52 +55 @@
 #define ORXONOX_ARCHITECTURE_64 2
 
-/* Finds the compiler type and version.
-*/
+
+/* Finds the compiler type and version. */
+
 #if defined( _MSC_VER )
 #  define ORXONOX_COMPILER ORXONOX_COMPILER_MSVC
@@ -73 +77 @@
 #endif
 
+
 /* See if we can use __forceinline or if we need to use __inline instead */
 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
@@ -87 +92 @@
 
 /* Finds the current platform */
-
 #if defined( __WIN32__ ) || defined( _WIN32 )
 #  define ORXONOX_PLATFORM ORXONOX_PLATFORM_WIN32
-
 #elif defined( __APPLE_CC__)
 #  define ORXONOX_PLATFORM ORXONOX_PLATFORM_APPLE
-
 #else
 #  define ORXONOX_PLATFORM ORXONOX_PLATFORM_LINUX
 #endif
 
-    /* Find the arch type */
+/* Find the arch type */
 #if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__) || defined(__s390__) || defined(__s390x__)
 #  define ORXONOX_ARCH_TYPE ORXONOX_ARCHITECTURE_64
@@ -105 +107 @@
 #endif
 
-// For generating compiler warnings - should work on any compiler
-// As a side note, if you start your message with 'Warning: ', the MSVC
-// IDE actually does catch a warning :)
-// FIXME: Try this on linux box. Doesn't work with msvc
-//#define ORXONOX_QUOTE_INPLACE(x) # x
-//#define ORXONOX_QUOTE(x) ORXONOX_QUOTE_INPLACE(x)
-//#define ORXONOX_WARN( x )  message( __FILE__ "(" QUOTE( __LINE__ ) ") : " x "\n" )
-
-//----------------------------------------------------------------------------
-// Windows Settings
+/* Try to define function information */
+#ifndef __FUNCTIONNAME__
+#  if ORXONOX_COMPILER == ORXONOX_COMPILER_BORL
+#    define __FUNCTIONNAME__ __FUNC__
+#  elif ORXONOX_COMPILER == ORXONOX_COMPILER_GNUC
+#    define __FUNCTIONNAME__ __PRETTY_FUNCTION__
+#  elif ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#    define __FUNCTIONNAME__ __FUNCTION__
+#  else
+#    define __FUNCTIONNAME__
+#  endif
+#endif
+
+/* Determine whether we're building in debug mode */
+#if defined(_DEBUG) || defined(DEBUG)
+#  define ORXONOX_DEBUG_MODE 1
+#else
+#  define ORXONOX_DEBUG_MODE 0
+#endif
+
+/* Define configurable floating point type */
+namespace orxonox
+{
+#ifdef ORXONOX_DOUBLE_PRECISION
+    typedef double Real;
+#else
+    typedef float  Real;
+#endif
+}
+
+
+
+/*---------------------------------
+ * Windows Settings
+ *-------------------------------*/
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
-
-// Win32 compilers use _DEBUG for specifying debug builds.
-#  ifdef _DEBUG
-#    define ORXONOX_DEBUG_MODE 1
-#  else
-#    define ORXONOX_DEBUG_MODE 0
-#  endif
-
-// Disable unicode support on MingW at the moment, poorly supported in stdlibc++
-// STLPORT fixes this though so allow if found
-// MinGW C++ Toolkit supports unicode and sets the define __MINGW32_TOOLKIT_UNICODE__ in _mingw.h
+/* Disable unicode support on MingW at the moment, poorly supported in stdlibc++
+ * STLPORT fixes this though so allow if found
+ * MinGW C++ Toolkit supports unicode and sets the define __MINGW32_TOOLKIT_UNICODE__ in _mingw.h */
 #  if defined( __MINGW32__ ) && !defined(_STLPORT_VERSION)
 #    include<_mingw.h>
@@ -137 +156 @@
 #    define ORXONOX_UNICODE_SUPPORT 1
 #  endif
-
 #endif /* Platform Win32 */
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-// Linux/Apple Settings
+
+
+/*---------------------------------
+ * Linux/Apple Settings
+ *-------------------------------*/
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_LINUX || ORXONOX_PLATFORM == ORXONOX_PLATFORM_APPLE
 
-
-// A quick define to overcome different names for the same function
+/* A quick define to overcome different names for the same function */
 #  define stricmp strcasecmp
 
-// Unlike the Win32 compilers, Linux compilers seem to use DEBUG for when
-// specifying a debug build.
-// (??? this is wrong, on Linux debug builds aren't marked in any way unless
-// you mark it yourself any way you like it -- zap ???)
-#  ifdef DEBUG
-#    define ORXONOX_DEBUG_MODE 1
-#  else
-#    define ORXONOX_DEBUG_MODE 0
-#  endif
-
-/* FIXME: Check what this actually is and whether we need it or not
+/* TODO: Check what this actually is and whether we need it or not */
+#if 0
 #  if ORXONOX_PLATFORM == ORXONOX_PLATFORM_APPLE
 #    define ORXONOX_PLATFORM_LIB "OrxonoxPlatform.bundle"
 #  else
-// ORXONOX_PLATFORM_LINUX
+/* ORXONOX_PLATFORM_LINUX */
 #    define ORXONOX_PLATFORM_LIB "libOrxonoxPlatform.so"
 #  endif
-*/
-
-// Always enable unicode support for the moment
-// Perhaps disable in old versions of gcc if necessary
+#endif
+
+/* Always enable unicode support for the moment
+ * Perhaps disable in old versions of gcc if necessary */
 #  define ORXONOX_UNICODE_SUPPORT 1
 
 #endif /* Patform Linux/Apple */
 
-//For apple, we always have a custom config.h file
+
+/*---------------------------------
+ * Apple Settings
+ *-------------------------------*/
+/* For apple, we always have a custom config.h file */
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_APPLE
 #  include "config.h"
 #endif
 
-//----------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------
-// Endian Settings
-// check for BIG_ENDIAN config flag, set ORXONOX_ENDIAN correctly
-#ifdef ORXONOX_CONFIG_BIG_ENDIAN
-#  define ORXONOX_ENDIAN ORXONOX_ENDIAN_BIG
-#else
-#  define ORXONOX_ENDIAN ORXONOX_ENDIAN_LITTLE
-#endif
-
-//-----------------------------------------------------------------------
-// fixed width integers
-//-----------------------------------------------------------------------
+
+/*---------------------------------
+ * Visual Studio Settings
+ *-------------------------------*/
 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
-typedef __int8            int8_t;
-typedef __int16           int16_t;
-typedef __int32           int32_t;
-typedef __int64           int64_t;
-typedef unsigned __int8   uint8_t;
-typedef unsigned __int16  uint16_t;
-typedef unsigned __int32  uint32_t;
-typedef unsigned __int64  uint64_t;
-#else
-# include "inttypes.h"
-#endif
-
-namespace orxonox {
-#ifdef ORXONOX_DOUBLE_PRECISION
-typedef double Real;
-#else
-typedef float Real;
-#endif
-}
-
-
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
-// Turn off warnings generated by long std templates
-// This warns about truncation to 255 characters in debug/browse info
-//#   pragma warning (disable : 4786)
-
-// Turn off warnings generated by long std templates
-// This warns about truncation to 255 characters in debug/browse info
-//#   pragma warning (disable : 4503)
-
-// disable: conversion from 'double' to 'float', possible loss of data
-// disable: conversion from 'ogg_int64_t' to 'long', possible loss of data
-// This has been dealt with in base_properties of the solution since the
-// warning primarily occurs in library header files (which are mostly
-// included before OrxonoxPlatform.h is)
-//#   pragma warning (disable : 4244)
-
-// disable: "conversion from 'size_t' to 'unsigned int', possible loss of data
-//#   pragma warning (disable : 4267)
-
-// disable: "truncation from 'double' to 'float'
-//#   pragma warning (disable : 4305)
-
-// set to level 4: "<type> needs to have dll-interface to be used by clients'
-// Happens on STL member variables which are not public therefore is ok
+/* Turn off warnings generated by long std templates
+ * This warns about truncation to 255 characters in debug/browse info */
+/*#   pragma warning (disable : 4786)*/
+
+/* Turn off warnings generated by long std templates
+ * This warns about truncation to 255 characters in debug/browse info */
+/*#   pragma warning (disable : 4503)*/
+
+/* disable: conversion from 'double' to 'float', possible loss of data
+ * disable: conversion from 'ogg_int64_t' to 'long', possible loss of data
+ * This has been dealt with in base_properties of the solution since the
+ * warning primarily occurs in library header files (which are mostly
+ * included before OrxonoxPlatform.h is) */
+/*#   pragma warning (disable : 4244)*/
+
+/* disable: "conversion from 'size_t' to 'unsigned int', possible loss of data */
+/*#   pragma warning (disable : 4267)*/
+
+/* disable: "truncation from 'double' to 'float' */
+/*#   pragma warning (disable : 4305)*/
+
+/* set to level 4: "<type> needs to have dll-interface to be used by clients'
+ * Happens on STL member variables which are not public therefore is ok */
 #   pragma warning (disable : 4251)
 
-// disable: 'MultiTypeString' : multiple assignment operators specified
-// Used in MultiType and works fine so far
-//#   pragma warning (disable : 4522)
-
-// disable: "non dll-interface class used as base for dll-interface class"
-// Happens when deriving from Singleton because bug in compiler ignores
-// template export
-//#   pragma warning (disable : 4275)
-
-// disable: "C++ Exception Specification ignored"
-// This is because MSVC 6 did not implement all the C++ exception
-// specifications in the ANSI C++ draft.
-//#   pragma warning( disable : 4290 )
-
-// disable: "no suitable definition provided for explicit template
-// instantiation request" Occurs in VC7 for no justifiable reason on all
-// #includes of Singleton
-//#   pragma warning( disable: 4661)
-
-// disable: deprecation warnings when using CRT calls in VC8
-// These show up on all C runtime lib code in VC8, disable since they clutter
-// the warnings with things we may not be able to do anything about (e.g.
-// generated code from nvparse etc). I doubt very much that these calls
-// will ever be actually removed from VC anyway, it would break too much code.
-//#     pragma warning( disable: 4996)
-
-// disable: "conditional expression constant", always occurs on
-// ORXONOX_MUTEX_CONDITIONAL when no threading enabled
-//#   pragma warning (disable : 201)
-
-
-// Define the english written operators like and, or, xor
+/* disable: 'MultiTypeString' : multiple assignment operators specified
+ * Used in MultiType and works fine so far */
+/*#   pragma warning (disable : 4522)*/
+
+/* disable: "non dll-interface class used as base for dll-interface class"
+ * Happens when deriving from Singleton because bug in compiler ignores
+ * template export */
+/*#   pragma warning (disable : 4275)*/
+
+/* disable: "C++ Exception Specification ignored"
+ * This is because MSVC 6 did not implement all the C++ exception
+ * specifications in the ANSI C++ draft. */
+/*#   pragma warning( disable : 4290 )*/
+
+/* disable: "no suitable definition provided for explicit template
+ * instantiation request" Occurs in VC7 for no justifiable reason on all
+ * #includes of Singleton */
+/*#   pragma warning( disable: 4661)*/
+
+/* disable: deprecation warnings when using CRT calls in VC8
+ * These show up on all C runtime lib code in VC8, disable since they clutter
+ * the warnings with things we may not be able to do anything about (e.g.
+ * generated code from nvparse etc). I doubt very much that these calls
+ * will ever be actually removed from VC anyway, it would break too much code. */
+/*# pragma warning( disable: 4996)*/
+
+/* disable: "conditional expression constant", always occurs on
+ * ORXONOX_MUTEX_CONDITIONAL when no threading enabled */
+/*#   pragma warning (disable : 201)*/
+
+
+/* Define the english written operators like and, or, xor */
 #include <iso646.h>
 
+/* include visual leak detector to search for memory leaks */
+/* #include <vld.h> */
+
 #endif /* ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC */
 
-// include visual leak detector to search for memory leaks
-//#include <vld.h>
-
 #endif /* _OrxonoxPlatform_H__ */

code/trunk/src/util/Sleep.h

@@ -28 +28 @@
 
 /**
- @file  Sleep.h
- @brief Macros for using sleep() and usleep() under windows
+ @file
+ @brief
+    Functions for using sleep() and usleep() under windows.
  */
 
-#include "UtilPrereqs.h"
+#ifndef _Sleep_H__
+#define _Sleep_H__
+
+#include "OrxonoxPlatform.h"
 
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
+
+#ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+
 inline void usleep(DWORD dwMicroseconds)
 {
   Sleep(dwMicroseconds / 1000);
 }
+
 inline void msleep(DWORD dwMilliseconds)
 {
   Sleep(dwMilliseconds);
 }
+
 inline void sleep(DWORD dwSeconds)
 {
   Sleep(dwSeconds * 1000);
 }
-#else
-#  include <unistd.h>
+
+#else /* Linux/Apple */
+
+#include <unistd.h>
+
 inline void msleep(unsigned long msec)
 {
   usleep(msec * 1000);
 }
+
 #endif
+
+#endif /* _Sleep_H__ */

code/trunk/src/util/SubString.h

@@ -131 +131 @@
   /** @brief Returns the i'th string from the subset of Strings @param i the i'th String */
   inline const std::string& getString(unsigned int i) const { return (*this)[i]; };
+  /** @brief Returns all Strings as std::vector */
+  inline const std::vector<std::string>& getAllStrings() const { return this->strings; }
   /** @brief Returns true if the token is in safemode. @param i the i'th token */
   inline bool isInSafemode(unsigned int i) const { return this->bInSafemode[i]; }