瀏覽代碼

Do not use Log when assert

Daniele Bartolini 12 年之前
父節點
當前提交
38e019099e

+ 1 - 0
engine/audio/OggDecoder.h

@@ -31,6 +31,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "Types.h"
 #include "Assert.h"
+#include "Log.h"
 
 #define SOUND_STREAM_BUFFER_SIZE (4096 * 2) // 8K... should be tested
 

+ 1 - 0
engine/compilers/Compiler.cpp

@@ -29,6 +29,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "DiskFilesystem.h"
 #include "ResourceFormat.h"
 #include "File.h"
+#include "Log.h"
 
 namespace crown
 {

+ 1 - 0
engine/compilers/lua/LuaCompiler.cpp

@@ -31,6 +31,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "DynamicString.h"
 #include "Filesystem.h"
 #include "OS.h"
+#include "Log.h"
 
 namespace crown
 {

+ 1 - 0
engine/compilers/package/PackageCompiler.cpp

@@ -32,6 +32,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "PackageCompiler.h"
 #include "PackageResource.h"
 #include "TempAllocator.h"
+#include "Log.h"
 
 namespace crown
 {

+ 3 - 4
engine/core/Assert.h

@@ -29,13 +29,12 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include <cstdlib>
 #include <cstdio>
 #include "Config.h"
-#include "Log.h"
 
 #if defined(CROWN_DEBUG) || defined(CROWN_DEVELOPMENT)
 	#define CE_ASSERT(condition, ...) do { if (!(condition)) {\
-		crown::Log::e("Assertion failed: %s", #condition);\
-		crown::Log::e("\t" __VA_ARGS__);\
-		crown::Log::e("\n\tIn %s:%d\n\n", __FILE__, __LINE__); abort();} } while (0)
+		printf("Assertion failed: %s\n", #condition);\
+		printf("\t" __VA_ARGS__);\
+		printf("\n\n\tIn %s:%d\n\n", __FILE__, __LINE__); abort();} } while (0)
 #else
 	#define CE_ASSERT(...) ((void)0)
 #endif

+ 4 - 4
engine/core/filesystem/DiskFile.cpp

@@ -82,8 +82,8 @@ void DiskFile::read(void* buffer, size_t size)
 		m_file.seek(0);
 	}
 
-	size_t bytes_read = m_file.read(buffer, size);
-	CE_ASSERT(bytes_read == size, "Failed to read from file: requested: %lu, read: %lu", size, bytes_read);
+	/*size_t bytes_read =*/ m_file.read(buffer, size);
+	//CE_ASSERT(bytes_read == size, "Failed to read from file: requested: %llu, read: %llu", size, bytes_read);
 }
 
 //-----------------------------------------------------------------------------
@@ -97,8 +97,8 @@ void DiskFile::write(const void* buffer, size_t size)
 		m_file.seek(0);
 	}
 
-	size_t bytes_written = m_file.write(buffer, size);
-	CE_ASSERT(bytes_written == size, "Failed to write to file: requested: %lu, written: %lu", size, bytes_written);
+	/*size_t bytes_written =*/ m_file.write(buffer, size);
+	//CE_ASSERT(bytes_written == size, "Failed to write to file: requested: %llu, written: %llu", size, bytes_written);
 }
 
 //-----------------------------------------------------------------------------