Browse Source

Remove old comments and switch buffer size to a const.

Lloyd Weehuizen 15 years ago
parent
commit
0fe7c29cde
3 changed files with 8 additions and 10 deletions
  1. 0 1
      Include/Rocket/Core/Types.h
  2. 6 7
      Include/Rocket/Core/Variant.h
  3. 2 2
      Source/Core/TextureResource.cpp

+ 0 - 1
Include/Rocket/Core/Types.h

@@ -82,7 +82,6 @@ class Dictionary;
 
 // Types for external interfaces.
 typedef void* FileHandle;
-//typedef void* TextureHandle;
 typedef uintptr_t TextureHandle;
 typedef void* CompiledGeometryHandle;
 typedef void* DecoratorDataHandle;

+ 6 - 7
Include/Rocket/Core/Variant.h

@@ -33,12 +33,6 @@
 #include <Rocket/Core/TypeConverter.h>
 #include <list>
 
-#ifdef ROCKET_ARCH_64
-    #define ROCKET_VARIANT_BUFFER_SIZE 32
-#else
-    #define ROCKET_VARIANT_BUFFER_SIZE 16
-#endif
-
 namespace Rocket {
 namespace Core {
 
@@ -156,7 +150,12 @@ private:
 		void Clear();
 		Type type;
 
-		char data[ROCKET_VARIANT_BUFFER_SIZE];
+#ifdef ROCKET_ARCH_64
+		static const int BUFFER_SIZE = 32;
+#else
+		static const int BUFFER_SIZE = 16;
+#endif
+		char data[BUFFER_SIZE];
 		void* data_ptr;
 
 		mutable int reference_count;

+ 2 - 2
Source/Core/TextureResource.cpp

@@ -92,7 +92,7 @@ void TextureResource::Release(RenderInterface* render_interface)
 		for (TextureDataMap::iterator texture_iterator = texture_data.begin(); texture_iterator != texture_data.end(); ++texture_iterator)
 		{
 			TextureHandle handle = texture_iterator->second.first;
-			if (handle != NULL)
+			if (handle)
 				texture_iterator->first->ReleaseTexture(handle);
 		}
 
@@ -105,7 +105,7 @@ void TextureResource::Release(RenderInterface* render_interface)
 			return;
 
 		TextureHandle handle = texture_iterator->second.first;
-		if (handle != NULL)
+		if (handle)
 			texture_iterator->first->ReleaseTexture(handle);
 
 		texture_data.erase(render_interface);