lib/mingle headers: drop 'extern "C"'

These headers are only used by C++ code, so they no longer need to fallback to C
linkage.

Gitlab: #2154

diff --git a/lib/mingle/agglomerative_bundling.h b/lib/mingle/agglomerative_bundling.h
index c1c90fa1c967ee87df4cc69f46f264f45e1d4534..d3c6222a84b56bb1b1852b5b787b3ff5212abc3a 100644 (file)
--- a/lib/mingle/agglomerative_bundling.h
+++ b/lib/mingle/agglomerative_bundling.h
@@ -10,10 +10,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct Agglomerative_Ink_Bundling_struct *Agglomerative_Ink_Bundling;
 
 struct Agglomerative_Ink_Bundling_struct {
@@ -33,7 +29,3 @@ struct Agglomerative_Ink_Bundling_struct {
 };
 
 pedge* agglomerative_ink_bundling(int dim, SparseMatrix A, pedge* edges, int nneighbor, int max_recursion, double angle_param, double angle, int open_gl, int *flag);
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/lib/mingle/edge_bundling.h b/lib/mingle/edge_bundling.h
index 76c313881b40cf127a88c7e9ce76152ec3dacddd..e95a096ffc8da87f9ba7545be063a88c2508febc 100644 (file)
--- a/lib/mingle/edge_bundling.h
+++ b/lib/mingle/edge_bundling.h
@@ -12,10 +12,6 @@
 
 #include <sparse/SparseMatrix.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct pedge_struct {
   double wgt; /* weight, telling how many original edges this edge represent. If this edge consists of multiple sections of different weights then this is a lower bound. This only applied for agglomerative bundling */
   int npoints;/* number of poly points */
@@ -37,7 +33,3 @@ enum {COMPATIBILITY_DIST = 0, COMPATIBILITY_FULL};
 pedge pedge_new(int np, int dim, double *x);
 pedge pedge_wgt_new(int np, int dim, double *x, double wgt);
 pedge pedge_double(pedge e);
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/lib/mingle/ink.h b/lib/mingle/ink.h
index 1cbba48437f9d891ca37f3e2fce1cd476b5229b5..2f8c2ba8540258057b61da52da450920c532abfe 100644 (file)
--- a/lib/mingle/ink.h
+++ b/lib/mingle/ink.h
@@ -12,10 +12,6 @@
 
 #include <mingle/edge_bundling.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct {
   double x, y;
 } point_t;
@@ -36,7 +32,3 @@ double ink(pedge* edges, int numEdges, int *pick, double *ink0, point_t *meet1,
 double ink1(pedge e);
 
 extern double ink_count;
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/lib/mingle/nearest_neighbor_graph.h b/lib/mingle/nearest_neighbor_graph.h
index e4fad4a5b8f05c38de264e0380829df5bf72e66d..6d26cb76dd9aba5fe6d2df68764947b1ab5f42b8 100644 (file)
--- a/lib/mingle/nearest_neighbor_graph.h
+++ b/lib/mingle/nearest_neighbor_graph.h
@@ -10,12 +10,4 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 SparseMatrix nearest_neighbor_graph(int nPts, int num_neigbors, double *x, double eps);
-
-#ifdef __cplusplus
-}
-#endif