Add semicolons after mjSORT macro calls.

yuvaltassa · copybara-github · commit 4b8454b79c1d · 2025-09-18T08:13:46.000-07:00
PiperOrigin-RevId: 808587320
Change-Id: I9fd290b9a2b615647135f1250e87af8ea9bb81f6
diff --git a/cmake/MujocoOptions.cmake b/cmake/MujocoOptions.cmake
@@ -92,6 +92,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang
       -Wimplicit-fallthrough
       -Wunused
       -Wvla
+      -Wno-extra-semi
       -Wno-int-in-bool-context
       -Wno-sign-compare
       -Wno-unknown-pragmas
diff --git a/sample/cmake/SampleOptions.cmake b/sample/cmake/SampleOptions.cmake
@@ -92,6 +92,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang
       -Wimplicit-fallthrough
       -Wunused
       -Wvla
+      -Wno-extra-semi
       -Wno-int-in-bool-context
       -Wno-sign-compare
       -Wno-unknown-pragmas
diff --git a/simulate/cmake/SimulateOptions.cmake b/simulate/cmake/SimulateOptions.cmake
@@ -92,6 +92,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang
       -Wimplicit-fallthrough
       -Wunused
       -Wvla
+      -Wno-extra-semi
       -Wno-int-in-bool-context
       -Wno-sign-compare
       -Wno-unknown-pragmas
diff --git a/src/engine/engine_collision_driver.c b/src/engine/engine_collision_driver.c
@@ -257,7 +257,7 @@ static inline int contactcompare(const mjContact* c1, const mjContact* c2, void*
 }
 
 // define contactSort function for sorting contacts
-mjSORT(contactSort, mjContact, contactcompare)
+mjSORT(contactSort, mjContact, contactcompare);
 
 
 
@@ -1139,7 +1139,7 @@ static inline int uintcmp(int* i, int* j, void* context) {
 }
 
 // define bfsort function for sorting bodyflex pairs
-mjSORT(bfsort, int, uintcmp)
+mjSORT(bfsort, int, uintcmp);
 
 
 // broadphase collision detector

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ static inline int contactcompare(const mjContact* c1, const mjContact* c2, void*`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`// define contactSort function for sorting contacts`
`260`		`-mjSORT(contactSort, mjContact, contactcompare)`
	`260`	`+mjSORT(contactSort, mjContact, contactcompare);`
`261`	`261`
`262`	`262`
`263`	`263`
`@@ -1139,7 +1139,7 @@ static inline int uintcmp(int* i, int* j, void* context) {`
`1139`	`1139`	`}`
`1140`	`1140`
`1141`	`1141`	`// define bfsort function for sorting bodyflex pairs`
`1142`		`-mjSORT(bfsort, int, uintcmp)`
	`1142`	`+mjSORT(bfsort, int, uintcmp);`
`1143`	`1143`
`1144`	`1144`
`1145`	`1145`	`// broadphase collision detector`