Просмотр исходного кода

device: avoid warnings in release builds

Daniele Bartolini 3 лет назад
Родитель
Сommit
5298acdf84
2 измененных файлов с 7 добавлено и 5 удалено
  1. 2 0
      src/core/types.h
  2. 5 5
      src/device/profiler.h

+ 2 - 0
src/core/types.h

@@ -91,6 +91,8 @@ u64 STRING_ID_64(const char *str, const u64 id);
 
 #define CE_NOOP(...) do { (void)0; } while (0)
 #define CE_UNUSED(x) do { (void)(x); } while (0)
+#define CE_UNUSED_2(a, b) CE_UNUSED(a); CE_UNUSED(b)
+#define CE_UNUSED_3(a, b, c) CE_UNUSED_2(a, b); CE_UNUSED(c)
 #define CE_STATIC_ASSERT(condition, ...) static_assert(condition, "" # __VA_ARGS__)
 
 #if CROWN_COMPILER_GCC || CROWN_COMPILER_CLANG

+ 5 - 5
src/device/profiler.h

@@ -115,10 +115,10 @@ namespace profiler_globals
 	#define ALLOCATE_MEMORY(name, size) profiler::allocate_memory(name, size)
 	#define DEALLOCATE_MEMORY(name, size) profiler::deallocate_memory(name, size)
 #else
-	#define ENTER_PROFILE_SCOPE(name) CE_NOOP()
+	#define ENTER_PROFILE_SCOPE(name) CE_UNUSED(name)
 	#define LEAVE_PROFILE_SCOPE() CE_NOOP()
-	#define RECORD_FLOAT(name, value) CE_NOOP()
-	#define RECORD_VECTOR3(name, value) CE_NOOP()
-	#define ALLOCATE_MEMORY(name, size) CE_NOOP()
-	#define DEALLOCATE_MEMORY(name, size) CE_NOOP()
+	#define RECORD_FLOAT(name, value) CE_UNUSED_2(name, value)
+	#define RECORD_VECTOR3(name, value) CE_UNUSED_2(name, value)
+	#define ALLOCATE_MEMORY(name, size) CE_UNUSED_2(name, size)
+	#define DEALLOCATE_MEMORY(name, size) CE_UNUSED_2(name, size)
 #endif