Changeset 1022

Timestamp:

11/27/07 17:25:35 (8 months ago)

Author:

patrick

Message:

Merged r1019 from the trunk so that this branch can be build on Mac OS X 10.5.

Files:

• branches/fcptr_stable_jun07/Source/Base/Base/OSGBaseTypeTraits.h (modified) (1 diff)
• branches/fcptr_stable_jun07/Source/Base/Base/OSGConfig.h (modified) (1 diff)
• branches/fcptr_stable_jun07/Source/Base/Base/OSGExceptionBinaryDataHandler.h (modified) (4 diffs)
• branches/fcptr_stable_jun07/Source/Base/Base/OSGExceptionBinaryDataHandler.inl (modified) (4 diffs)
• branches/fcptr_stable_jun07/Source/Base/Base/OSGGLU.h (modified) (1 diff)
• branches/fcptr_stable_jun07/Source/WindowSystem/CoreGL/testWindowCoreGL.cpp (modified) (1 diff)

branches/fcptr_stable_jun07/Source/Base/Base/OSGBaseTypeTraits.h

@@ -1320 +1320 @@
-
-
+#ifdef SIZE_T_NEQ_UINT32
+
+/*! \ingroup GrpBaseBaseBaseTypeTraits
+ */
+
+template <>
+struct TypeTraits<size_t> : public TypeTraitsTemplateBase<size_t>
+{
+    typedef       Real32                RealReturnType;
+
+
+    static const  bool               IsPOD       = true;
+    static const  MathTypeProperties MathProp    = IntValue;
+
+    static const  UInt32             BitsSet     = 0xFFFFFFFF;
+    static const  UInt32             BitsClear   = 0x00000000;
+
+
+    static        size_t             getZeroElement(void)
+    {
+        return 0;
+    }
+
+    static        size_t             getOneElement (void)
+    {
+        return 1;
+    }
+
+    static        size_t             getMax        (void) 
+    { 
+        return std::numeric_limits<size_t>::max();
+    }
+
+    static        size_t             getMin        (void)
+    {
+        return std::numeric_limits<size_t>::min();
+    }
+
+
+    static size_t      getFromCString(const Char8 * pData,
+                                            Char8 *&pDataEnd)
+    {
+        if(pData != NULL)
+        {
+            return size_t(strtoul(pData, &pDataEnd, 0));
+        }
+        else
+        {
+            return getZeroElement();
+        }
+    }
+
+
+    static size_t      getFromCString(const Char8 *pData)
+    {
+        Char8 *pDataEnd;
+
+        return getFromCString(pData, pDataEnd);
+    }
+
+
+    static void putToString  (const size_t       val,
+                                    std::string &out)
+    {
+        Char8 buffer[15];
+
+        sprintf(buffer, "%u", val);
+
+        out.append(buffer);
+    }
+};
+
+#endif
+
+
-#ifdef OSG_GLENUM_NEQ_UINT32
-

branches/fcptr_stable_jun07/Source/Base/Base/OSGConfig.h

@@ -645 +645 @@
-# define OSG_NO_CONCEPT_CHECKS 
-# define SIZE_T_NEQ_UINT32
-
+
+
+
-
-# define OSG_USE_PTHREADS

branches/fcptr_stable_jun07/Source/Base/Base/OSGExceptionBinaryDataHandler.h

@@ -116 +116 @@
-    void putValue  (const Real128      &value              );
-    void putValue  (const std::string  &value              );
-__APPLE__
+OSG_GLENUM_NEQ_UINT32
-    void putValue  (const GLenum       &value              );
-#endif
@@ -135 +135 @@
-    void putValues (const Real128      *value, UInt32 size);
-    void putValues (const std::string  *value, UInt32 size);
-__APPLE__
+OSG_GLENUM_NEQ_UINT32
-    void putValues (const GLenum       *value, UInt32 size);
-#endif
@@ -162 +162 @@
-    void getValue   (Real128      &value             ) throw (ReadError);
-    void getValue   (std::string  &value             ) throw (ReadError);
-__APPLE__
+OSG_GLENUM_NEQ_UINT32
-    void getValue   (GLenum       &value             ) throw (ReadError);
-#endif
@@ -181 +181 @@
-    void getValues  (Real128      *value, UInt32 size) throw (ReadError);
-    void getValues  (std::string  *value, UInt32 size) throw (ReadError);
-__APPLE__
+OSG_GLENUM_NEQ_UINT32
-    void getValues  (GLenum       *value, UInt32 size) throw (ReadError);
-#endif

branches/fcptr_stable_jun07/Source/Base/Base/OSGExceptionBinaryDataHandler.inl

@@ -179 +179 @@
-}
-
-__APPLE__
+OSG_GLENUM_NEQ_UINT32
-inline 
-void ExceptionBinaryDataHandler::putValue(const GLenum &value)
@@ -430 +430 @@
-}
-
-__APPLE__
+OSG_GLENUM_NEQ_UINT32
-inline 
-void ExceptionBinaryDataHandler::putValues(const GLenum *value, UInt32 size)
@@ -593 +593 @@
-}
-
-__APPLE__
+OSG_GLENUM_NEQ_UINT32
-inline
-void ExceptionBinaryDataHandler::getValue(GLenum &value) throw (ReadError)
@@ -827 +827 @@
-}
-
-__APPLE__
+OSG_GLENUM_NEQ_UINT32
-inline 
-void ExceptionBinaryDataHandler::getValues(GLenum *value, 

branches/fcptr_stable_jun07/Source/Base/Base/OSGGLU.h

@@ -69 +69 @@
-#  endif
-#elif defined(__APPLE__)
-
+
+
+
+
+
-#else
-typedef void (*OSGGLUfuncptr)();

branches/fcptr_stable_jun07/Source/WindowSystem/CoreGL/testWindowCoreGL.cpp

@@ -376 +376 @@
-    };
-    CGLPixelFormatObj pixelFormatObj;
-long
+GLint
-    CGLChoosePixelFormat(attribs, &pixelFormatObj, &numPixelFormats); 
-