[Hgengine-cvs] SF.net SVN: hgengine:[389] Mercury2/src

[<cn...@us...>]

Revision: 389
          http://hgengine.svn.sourceforge.net/hgengine/?rev=389&view=rev
Author:   cnlohr
Date:     2009-06-29 04:22:13 +0000 (Mon, 29 Jun 2009)

Log Message:
-----------
cleanup the utility file

Modified Paths:
--------------
    Mercury2/src/MercuryFBO.cpp
    Mercury2/src/MercuryHash.h
    Mercury2/src/MercuryUtil.h
    Mercury2/src/Shader.cpp
    Mercury2/src/Texture.cpp

Modified: Mercury2/src/MercuryFBO.cpp
===================================================================
--- Mercury2/src/MercuryFBO.cpp	2009-06-28 22:00:27 UTC (rev 388)
+++ Mercury2/src/MercuryFBO.cpp	2009-06-29 04:22:13 UTC (rev 389)
@@ -1,6 +1,7 @@
 #include <MercuryFBO.h>
 #include <GLHeaders.h>
 #include <MercuryWindow.h>
+#include <assert.h>
 
 REGISTER_NODE_TYPE(MercuryFBO);
 

Modified: Mercury2/src/MercuryHash.h
===================================================================
--- Mercury2/src/MercuryHash.h	2009-06-28 22:00:27 UTC (rev 388)
+++ Mercury2/src/MercuryHash.h	2009-06-29 04:22:13 UTC (rev 389)
@@ -3,6 +3,7 @@
 
 #include "global.h"
 #include <MercuryVector.h>
+#include <assert.h>
 
 ///Mercury Hash Table for Strings
 template<typename T>

Modified: Mercury2/src/MercuryUtil.h
===================================================================
--- Mercury2/src/MercuryUtil.h	2009-06-28 22:00:27 UTC (rev 388)
+++ Mercury2/src/MercuryUtil.h	2009-06-29 04:22:13 UTC (rev 389)
@@ -3,13 +3,9 @@
 
 #include <stdlib.h>
 #include <MercuryString.h>
-#include <assert.h>
 #include <global.h>
+#include <stdio.h>
 
-/*#ifndef NULL
-#define NULL 0
-#endif*/
-
 #define SAFE_DELETE( x ) { if (x) { delete x; } x = NULL; }
 #define SAFE_DELETE_ARRAY( x ) { if (x) { delete[] x; } x = NULL; }
 #define SAFE_FREE(p)       { if(p) { free(p); p=0; } }
@@ -20,8 +16,6 @@
 void* mmemalign(size_t align, size_t size, void*& mem);
 bool isAligned(size_t align, const void* mem);
 
-#define ASSERT(x) assert(!x)
-
 #if defined(__GNUC__)
 #define M_ALIGN(n) __attribute__((aligned(n)))
 #else
@@ -56,7 +50,6 @@
 //This counter is used with singletons to
 //ensure proper destruction order of the
 //singleton
-#include <stdio.h>
 template<typename T>
 class InstanceCounter
 {

Modified: Mercury2/src/Shader.cpp
===================================================================
--- Mercury2/src/Shader.cpp	2009-06-28 22:00:27 UTC (rev 388)
+++ Mercury2/src/Shader.cpp	2009-06-29 04:22:13 UTC (rev 389)
@@ -1,10 +1,8 @@
 #include <Shader.h>
 #include <MercuryNode.h>
 #include <MercuryFile.h>
-
+#include <assert.h>
 #include <GLHeaders.h>
-
-
 #include <string.h>
 
 using namespace std;

Modified: Mercury2/src/Texture.cpp
===================================================================
--- Mercury2/src/Texture.cpp	2009-06-28 22:00:27 UTC (rev 388)
+++ Mercury2/src/Texture.cpp	2009-06-29 04:22:13 UTC (rev 389)
@@ -4,6 +4,7 @@
 #include <MercuryNode.h>
 #include <GLHeaders.h>
 #include <Shader.h>
+#include <assert.h>
 
 using namespace std;
 


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