chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GCC "declaration of ... changes meaning" errors.

Browse Source 
PiperOrigin-RevId: 470175500
Change-Id: If13a81f308f803d3cc4731b3d4d0561cfe56d5c8
This commit is contained in:
Saran Tunyasuvunakool
2022-08-26 00:13:13 -07:00
committed by Copybara-Service
parent 3240596c3a
commit 9d9493153c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simulate/glfw_dispatch.cc
+1 -1
View File
@@ -60,7 +60,7 @@ const struct Glfw& Glfw(void* dlhandle) {
glfw.func = reinterpret_cast<decltype(glfw.func)>(dlsym(dlhandle, #func)) glfw.func = reinterpret_cast<decltype(glfw.func)>(dlsym(dlhandle, #func))
#endif #endif
#else #else
#define mjGLFW_RESOLVE_SYMBOL(func) glfw.func = &func #define mjGLFW_RESOLVE_SYMBOL(func) glfw.func = &::func
#endif #endif
#define mjGLFW_INITIALIZE_SYMBOL(func) \ #define mjGLFW_INITIALIZE_SYMBOL(func) \
simulate/glfw_dispatch.h
+1 -1
View File
@@ -22,7 +22,7 @@ namespace mujoco {
// This allows us to use GLFW without introducing a link-time dependency on the // This allows us to use GLFW without introducing a link-time dependency on the
// library, which is useful e.g. when using GLFW via Python. // library, which is useful e.g. when using GLFW via Python.
struct Glfw { struct Glfw {
#define mjGLFW_DECLARE_SYMBOL(func) decltype(&func) func #define mjGLFW_DECLARE_SYMBOL(func) decltype(&::func) func
// go/keep-sorted start // go/keep-sorted start
mjGLFW_DECLARE_SYMBOL(glfwCreateWindow); mjGLFW_DECLARE_SYMBOL(glfwCreateWindow);
mjGLFW_DECLARE_SYMBOL(glfwGetCursorPos); mjGLFW_DECLARE_SYMBOL(glfwGetCursorPos);