浏览代码

fix: typo in expansion
fix: #define GL_SILENCE_DEPRECATION

Sam Jaffe 1 年之前
父节点
当前提交
201a61199c

+ 1 - 0
graphics/src/openGL/error_formatter.cxx

@@ -10,6 +10,7 @@
 #include <sstream>
 #include <string>
 #ifdef __APPLE__
+#define GL_SILENCE_DEPRECATION
 #include <OpenGL/gl3.h>
 #endif
 

+ 1 - 0
graphics/src/openGL/opengl_manager.cxx

@@ -12,6 +12,7 @@
 #include <memory>
 #include <sstream>
 #ifdef __APPLE__
+#define GL_SILENCE_DEPRECATION
 #include <OpenGL/gl3.h>
 #endif
 

+ 1 - 0
graphics/src/openGL/opengl_renderer.cxx

@@ -9,6 +9,7 @@
 #include "opengl_renderer.h"
 
 #ifdef __APPLE__
+#define GL_SILENCE_DEPRECATION
 #include <OpenGL/gl3.h>
 #endif
 

+ 1 - 2
util/include/game/util/hash.hpp

@@ -31,8 +31,7 @@ template <typename T> void hash_combine(size_t & seed, T const & v) {
 template <typename T, size_t... Is>
 void hash_combine(size_t & seed, T const & tuple, std::index_sequence<Is...>) {
   // Expansion trick
-  [[maybe_unused]] int _[] = {(hash_combine(seed, std::get<Is>(tuple)), 0),
-                              ...};
+  [[maybe_unused]] int _[] = {(hash_combine(seed, std::get<Is>(tuple)), 0)...};
 }
 }