[Crystal-cvs] SF.net SVN: crystal: [29142] CS/trunk

[<re...@us...>]

Revision: 29142
          http://crystal.svn.sourceforge.net/crystal/?rev=29142&view=rev
Author:   res2002
Date:     2008-03-30 10:39:54 -0700 (Sun, 30 Mar 2008)

Log Message:
-----------
res applied a patch from Lukas Erlinghagen to fix compiling on
  gcc 3.4.

Modified Paths:
--------------
    CS/trunk/docs/history.txt
    CS/trunk/include/csutil/customallocated.h

Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt	2008-03-30 17:15:28 UTC (rev 29141)
+++ CS/trunk/docs/history.txt	2008-03-30 17:39:54 UTC (rev 29142)
@@ -8,6 +8,8 @@
 
 30-Mar-2008
 	- res fixed PBOs not being bound before used in the texture blit code.
+	- res applied a patch from Lukas Erlinghagen to fix compiling on
+	  gcc 3.4.
 26-Mar-2008
 	- Marten commited a number of re-inlinings of basic matrix & vector 
 	  methods.

Modified: CS/trunk/include/csutil/customallocated.h
===================================================================
--- CS/trunk/include/csutil/customallocated.h	2008-03-30 17:15:28 UTC (rev 29141)
+++ CS/trunk/include/csutil/customallocated.h	2008-03-30 17:39:54 UTC (rev 29142)
@@ -118,55 +118,55 @@
 
       // Potentially throwing versions
     #ifndef CS_NO_EXCEPTIONS
-      CS_FORCEINLINE void* operator new (size_t s) throw (std::bad_alloc)
+      CS_FORCEINLINE_TEMPLATEMETHOD void* operator new (size_t s) throw (std::bad_alloc)
       { 
 	void* p = cs_malloc (s);
 	if (!p) throw std::bad_alloc();
 	return p;
       }
-      CS_FORCEINLINE void* operator new[] (size_t s) throw (std::bad_alloc)
+      CS_FORCEINLINE_TEMPLATEMETHOD void* operator new[] (size_t s) throw (std::bad_alloc)
       { 
 	void* p = cs_malloc (s);
 	if (!p) throw std::bad_alloc();
 	return p;
       }
     #else
-      CS_FORCEINLINE void* operator new (size_t s) throw ()
+      CS_FORCEINLINE_TEMPLATEMETHOD void* operator new (size_t s) throw ()
       { return cs_malloc (s); }
-      CS_FORCEINLINE void* operator new[] (size_t s) throw ()
+      CS_FORCEINLINE_TEMPLATEMETHOD void* operator new[] (size_t s) throw ()
       { return cs_malloc (s); }
     #endif
       
-      CS_FORCEINLINE void operator delete (void* p) throw()
+      CS_FORCEINLINE_TEMPLATEMETHOD void operator delete (void* p) throw()
       { cs_free (p); }
-      CS_FORCEINLINE void operator delete[] (void* p) throw()
+      CS_FORCEINLINE_TEMPLATEMETHOD void operator delete[] (void* p) throw()
       { cs_free (p); }
       
       // Nothrow versions
-      CS_FORCEINLINE void* operator new (size_t s, const std::nothrow_t&) throw()
+      CS_FORCEINLINE_TEMPLATEMETHOD void* operator new (size_t s, const std::nothrow_t&) throw()
       { return cs_malloc (s); }
-      CS_FORCEINLINE void* operator new[] (size_t s, const std::nothrow_t&) throw()
+      CS_FORCEINLINE_TEMPLATEMETHOD void* operator new[] (size_t s, const std::nothrow_t&) throw()
       { return cs_malloc (s); }
-      CS_FORCEINLINE void operator delete (void* p, const std::nothrow_t&) throw()
+      CS_FORCEINLINE_TEMPLATEMETHOD void operator delete (void* p, const std::nothrow_t&) throw()
       { cs_free (p); }
-      CS_FORCEINLINE void operator delete[] (void* p, const std::nothrow_t&) throw()
+      CS_FORCEINLINE_TEMPLATEMETHOD void operator delete[] (void* p, const std::nothrow_t&) throw()
       { cs_free (p); }
       
       // Placement versions
-      CS_FORCEINLINE void* operator new(size_t /*s*/, void* p) throw() { return p; }
-      CS_FORCEINLINE void* operator new[](size_t /*s*/, void* p) throw() { return p; }
+      CS_FORCEINLINE_TEMPLATEMETHOD void* operator new(size_t /*s*/, void* p) throw() { return p; }
+      CS_FORCEINLINE_TEMPLATEMETHOD void* operator new[](size_t /*s*/, void* p) throw() { return p; }
 
-      CS_FORCEINLINE void operator delete(void*, void*) throw() { }
-      CS_FORCEINLINE void operator delete[](void*, void*) throw() { }
+      CS_FORCEINLINE_TEMPLATEMETHOD void operator delete(void*, void*) throw() { }
+      CS_FORCEINLINE_TEMPLATEMETHOD void operator delete[](void*, void*) throw() { }
     
     #if defined(CS_EXTENSIVE_MEMDEBUG) || defined(CS_MEMORY_TRACKER)
-      CS_FORCEINLINE void* operator new (size_t s, void*, int)
+      CS_FORCEINLINE_TEMPLATEMETHOD void* operator new (size_t s, void*, int)
       { return cs_malloc (s); }
-      CS_FORCEINLINE void operator delete (void* p, void*, int)
+      CS_FORCEINLINE_TEMPLATEMETHOD void operator delete (void* p, void*, int)
       { cs_free (p); }
-      CS_FORCEINLINE void* operator new[] (size_t s,  void*, int)
+      CS_FORCEINLINE_TEMPLATEMETHOD void* operator new[] (size_t s,  void*, int)
       { return cs_malloc (s); }
-      CS_FORCEINLINE void operator delete[] (void* p, void*, int)
+      CS_FORCEINLINE_TEMPLATEMETHOD void operator delete[] (void* p, void*, int)
       { cs_free (p); }
     #endif
     };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.