Daniele Bartolini 12 anni fa
parent
commit
e8f7f46121
2 ha cambiato i file con 42 aggiunte e 7 eliminazioni
  1. 8 7
      engine/CMakeLists.txt
  2. 34 0
      engine/core/mem/MemoryTypes.h

+ 8 - 7
engine/CMakeLists.txt

@@ -197,21 +197,22 @@ set (STRINGS_HEADERS
 )
 
 set (MEM_SRC
-	core/mem/Memory.cpp
 	core/mem/LinearAllocator.cpp
-	core/mem/StackAllocator.cpp
-	core/mem/ProxyAllocator.cpp
+	core/mem/Memory.cpp
 	core/mem/PoolAllocator.cpp
+	core/mem/ProxyAllocator.cpp
+	core/mem/StackAllocator.cpp
 )
 
 set (MEM_HEADERS
-	core/mem/Memory.h
 	core/mem/Allocator.h
-	core/mem/TempAllocator.h
 	core/mem/LinearAllocator.h
-	core/mem/StackAllocator.h
-	core/mem/ProxyAllocator.h
+	core/mem/Memory.h
+	core/mem/MemoryTypes.h
 	core/mem/PoolAllocator.h
+	core/mem/ProxyAllocator.h
+	core/mem/StackAllocator.h
+	core/mem/TempAllocator.h
 )
 
 set (COMPRESSORS_SRC

+ 34 - 0
engine/core/mem/MemoryTypes.h

@@ -0,0 +1,34 @@
+/*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
+Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#pragma once
+
+namespace crown
+{
+
+class Allocator;
+
+}; // namespace crown