Merge pull request #1280 from MRPT/fix/cs-external-linking

Fix C linkage build error in CSparse
MRPT · Aug 10, 2023 · 84f7f1d · 84f7f1d
2 parents a57e0f3 + afda967
commit 84f7f1d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/doc/source/doxygen-docs/changelog.md b/doc/source/doxygen-docs/changelog.md
@@ -1,7 +1,8 @@
 \page changelog Change Log
 
 # Version 2.10.2: UNRELEASED
-(No changes yet)
+- BUG FIXES:
+  - Fix CSparse "C" linkage build error (OSX Clang)
 
 # Version 2.10.1: Released August 10th, 2023
 - Build system:

diff --git a/libs/math/include/mrpt/math/CSparseMatrix.h b/libs/math/include/mrpt/math/CSparseMatrix.h
@@ -19,18 +19,14 @@
 #include <stdexcept>
 
 // Include CSparse lib headers, either from the system or embedded:
-extern "C"
-{
 #if MRPT_HAS_SUITESPARSE
-#define NCOMPLEX  // In MRPT we don't need complex numbers, so avoid the
-// annoying warning: 'cs_ci_house' has C-linkage specified,
-// but returns UDT 'std::complex<double>' which is
-// incompatible with C
 #include "cs.h"
 #else
+extern "C"
+{
 #include <mrpt/3rdparty/CSparse/cs.h>
-#endif
 }
+#endif
 
 namespace mrpt::math
 {