Split C/C++ headers (#30)

* Separate C and C++ include headers. closes #28
oxfordcontrol · Feb 27, 2024 · 5781948 · 5781948
1 parent 223bd8c
commit 5781948
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 24 deletions.
diff --git a/examples/c/example_expcone.c b/examples/c/example_expcone.c
@@ -1,6 +1,6 @@
 #include "utils.h"
 
-#include <Clarabel>
+#include <Clarabel.h>
 #include <math.h>
 
 int main(void)

diff --git a/examples/c/example_genpowcone.c b/examples/c/example_genpowcone.c
@@ -1,6 +1,6 @@
 #include "utils.h"
 
-#include <Clarabel>
+#include <Clarabel.h>
 
 // Generalized Power Cone Example
 //

diff --git a/examples/c/example_lp.c b/examples/c/example_lp.c
@@ -1,6 +1,6 @@
 #include "utils.h"
 
-#include <Clarabel>
+#include <Clarabel.h>
 
 int main(void)
 {

diff --git a/examples/c/example_powcone.c b/examples/c/example_powcone.c
@@ -1,6 +1,6 @@
 #include "utils.h"
 
-#include <Clarabel>
+#include <Clarabel.h>
 
 // Power Cone Example
 //

diff --git a/examples/c/example_qp.c b/examples/c/example_qp.c
@@ -3,7 +3,7 @@
 
 #include "utils.h"
 
-#include <Clarabel>
+#include <Clarabel.h>
 
 int main(void)
 {

diff --git a/examples/c/example_qp_f32.c b/examples/c/example_qp_f32.c
@@ -1,6 +1,6 @@
 #include "utils.h"
 
-#include <Clarabel>
+#include <Clarabel.h>
 
 int main(void)
 {

diff --git a/examples/c/example_qp_f64.c b/examples/c/example_qp_f64.c
@@ -1,6 +1,6 @@
 #include "utils.h"
 
-#include <Clarabel>
+#include <Clarabel.h>
 
 int main(void)
 {

diff --git a/examples/c/example_sdp.c b/examples/c/example_sdp.c
@@ -1,7 +1,7 @@
 // #define FEATURE_SDP
 #include "utils.h"
 
-#include <Clarabel>
+#include <Clarabel.h>
 #include <math.h>
 #include <stdio.h>
 

diff --git a/examples/c/example_socp.c b/examples/c/example_socp.c
@@ -1,6 +1,6 @@
 #include "utils.h"
 
-#include <Clarabel>
+#include <Clarabel.h>
 
 int main(void)
 {

diff --git a/examples/c/utils.h b/examples/c/utils.h
@@ -1,7 +1,7 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#include <Clarabel>
+#include <Clarabel.h>
 
 void print_solution_f64(ClarabelDefaultSolution_f64 *solution);
 

diff --git a/include/Clarabel b/include/Clarabel
@@ -1,8 +1,6 @@
 #ifndef CLARABEL_H
 #define CLARABEL_H
 
-#ifdef __cplusplus // C++ interface
-
 #include "cpp/CscMatrix.h"
 #include "cpp/DefaultInfo.h"
 #include "cpp/DefaultSettings.h"
@@ -11,15 +9,4 @@
 // #include "cpp/DefaultSolverEigen.h"
 #include "cpp/SupportedConeT.h"
 
-#else // C interface
-
-#include "c/CscMatrix.h"
-#include "c/DefaultInfo.h"
-#include "c/DefaultSettings.h"
-#include "c/DefaultSolution.h"
-#include "c/DefaultSolver.h"
-#include "c/SupportedConeT.h"
-
-#endif
-
-#endif
+#endif  // CLARABEL_H
diff --git a/include/Clarabel.h b/include/Clarabel.h
@@ -0,0 +1,11 @@
+#ifndef CLARABEL_H
+#define CLARABEL_H
+
+#include "c/CscMatrix.h"
+#include "c/DefaultInfo.h"
+#include "c/DefaultSettings.h"
+#include "c/DefaultSolution.h"
+#include "c/DefaultSolver.h"
+#include "c/SupportedConeT.h"
+
+#endif  // CLARABEL_H