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

Remove -Wno-extra-semi, add workaround for mjSORT confusing some IDEs

Browse Source 
PiperOrigin-RevId: 808689636
Change-Id: Ia091fb597c171a33842e62690d06f32614fbe4eb
This commit is contained in:
Yuval Tassa
2025-09-18 12:26:58 -07:00
committed by Copybara-Service
parent 60cb976e82
commit 681f5767b2
9 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/MujocoOptions.cmake
-1
View File
@@ -92,7 +92,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang
-Wimplicit-fallthrough -Wimplicit-fallthrough
-Wunused -Wunused
-Wvla -Wvla
-Wno-extra-semi
-Wno-int-in-bool-context -Wno-int-in-bool-context
-Wno-sign-compare -Wno-sign-compare
-Wno-unknown-pragmas -Wno-unknown-pragmas
sample/cmake/SampleOptions.cmake
-1
View File
@@ -92,7 +92,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang
-Wimplicit-fallthrough -Wimplicit-fallthrough
-Wunused -Wunused
-Wvla -Wvla
-Wno-extra-semi
-Wno-int-in-bool-context -Wno-int-in-bool-context
-Wno-sign-compare -Wno-sign-compare
-Wno-unknown-pragmas -Wno-unknown-pragmas
simulate/cmake/SimulateOptions.cmake
-1
View File
@@ -92,7 +92,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang
-Wimplicit-fallthrough -Wimplicit-fallthrough
-Wunused -Wunused
-Wvla -Wvla
-Wno-extra-semi
-Wno-int-in-bool-context -Wno-int-in-bool-context
-Wno-sign-compare -Wno-sign-compare
-Wno-unknown-pragmas -Wno-unknown-pragmas
src/engine/engine_collision_driver.c
+1 -1
View File
@@ -1012,7 +1012,7 @@ static inline int SAPcmp(mjtSAP* obj1, mjtSAP* obj2, void* context) {
} }
// define SAPsort function for sorting SAP sorting // define SAPsort function for sorting SAP sorting
mjSORT(SAPsort, mjtSAP, SAPcmp) mjSORT(SAPsort, mjtSAP, SAPcmp);
// given list of axis-aligned bounding boxes in AAMM (xmin[3], xmax[3]) format, // given list of axis-aligned bounding boxes in AAMM (xmin[3], xmax[3]) format,
src/engine/engine_sensor.c
+1 -1
View File
@@ -56,7 +56,7 @@ static int ContactInfoCompare(const ContactInfo* a, const ContactInfo* b, void*
return 0; return 0;
} }
mjPARTIAL_SORT(ContactSelect, ContactInfo, ContactInfoCompare) mjPARTIAL_SORT(ContactSelect, ContactInfo, ContactInfoCompare);
// apply cutoff after each stage // apply cutoff after each stage
src/engine/engine_sort.h
+2 -2
View File
@@ -70,7 +70,7 @@
tmp = src; src = dest; dest = tmp; \ tmp = src; src = dest; dest = tmp; \
} \ } \
if (src != arr) memcpy(arr, src, n * sizeof(type)); \ if (src != arr) memcpy(arr, src, n * sizeof(type)); \
} } static inline void name(type* arr, type* buf, int n, void* context)
// sub-macro that sifts down a node in a max heap to its correct position // sub-macro that sifts down a node in a max heap to its correct position
@@ -106,6 +106,6 @@
/* copy back and sort the result */ \ /* copy back and sort the result */ \
for (int j = 0; j < k; j++) arr[j] = buf[j]; \ for (int j = 0; j < k; j++) arr[j] = buf[j]; \
_mjINSERTION_SORT(type, arr, 0, k, cmp, context); \ _mjINSERTION_SORT(type, arr, 0, k, cmp, context); \
} } static inline void name(type* arr, type* buf, int n, int k, void* context)
#endif // MUJOCO_SRC_ENGINE_ENGINE_SORT_H_ #endif // MUJOCO_SRC_ENGINE_ENGINE_SORT_H_
src/render/render_gl3.c
+1 -1
View File
@@ -789,7 +789,7 @@ static inline int geomcmp(int* i, int* j, void* context) {
} }
// define geomSort function for sorting geoms // define geomSort function for sorting geoms
mjSORT(geomSort, int, geomcmp) mjSORT(geomSort, int, geomcmp);
test/benchmark/sort_benchmark_test.cc
+1 -1
View File
@@ -43,7 +43,7 @@ int CompareSortable(const Sortable* a, const Sortable* b, void* context) {
} }
// Instantiate the sort function. // Instantiate the sort function.
mjSORT(SortSortable, Sortable, CompareSortable) mjSORT(SortSortable, Sortable, CompareSortable);
// Generate data for sorting benchmarks. // Generate data for sorting benchmarks.
std::vector<Sortable> GenerateData(int n, double unsorted_fraction) { std::vector<Sortable> GenerateData(int n, double unsorted_fraction) {
test/engine/engine_sort_test.cc
+4 -4
View File
@@ -77,8 +77,8 @@ int IntCompare(int* i, int* j, void* context) {
return 1; return 1;
} }
} }
mjSORT(IntSort, int, IntCompare) mjSORT(IntSort, int, IntCompare);
mjPARTIAL_SORT(IntSelect, int, IntCompare) mjPARTIAL_SORT(IntSelect, int, IntCompare);
int IntStructCompare(const IntStruct* x, const IntStruct* y, void* context) { int IntStructCompare(const IntStruct* x, const IntStruct* y, void* context) {
IntStruct* a = (IntStruct*)x; IntStruct* a = (IntStruct*)x;
@@ -91,8 +91,8 @@ int IntStructCompare(const IntStruct* x, const IntStruct* y, void* context) {
return 1; return 1;
} }
} }
mjSORT(IntStructSort, IntStruct, IntStructCompare) mjSORT(IntStructSort, IntStruct, IntStructCompare);
mjPARTIAL_SORT(IntStructSelect, IntStruct, IntStructCompare) mjPARTIAL_SORT(IntStructSelect, IntStruct, IntStructCompare);
TEST_F(EngineSortTest, Sort) { TEST_F(EngineSortTest, Sort) {
int total = 0; int total = 0;