lib/mingle: move ink.c into C++

lib/mingle already has a C++ source, requiring it to link against the C++
standard library. There is no advantage to keeping some of its sources in C.

This does nothing fancy, just rename the existing file. All contained code looks
compatible across C and C++. Future commits will refactor this to more modern
C++ style.

Gitlab: #2154

diff --git a/lib/mingle/CMakeLists.txt b/lib/mingle/CMakeLists.txt
index f475dc9730d3583012bd2ae84998090c0c3b828d..51fd4033660d8482fde6a218dba20ee695182b34 100644 (file)
--- a/lib/mingle/CMakeLists.txt
+++ b/lib/mingle/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library(libmingle STATIC
     # Source files
     agglomerative_bundling.c
     edge_bundling.c
-    ink.c
+    ink.cpp
     nearest_neighbor_graph.c
     nearest_neighbor_graph_ann.cpp
 )

diff --git a/lib/mingle/Makefile.am b/lib/mingle/Makefile.am
index c6f664730587e08b0895414038c0fb8a2393e7ac..b79e74a2bb9d6f9d07f5615e9b1e31f37cc934d0 100644 (file)
--- a/lib/mingle/Makefile.am
+++ b/lib/mingle/Makefile.am
@@ -14,7 +14,8 @@ if WITH_ANN
 noinst_LTLIBRARIES = libmingle_C.la
 endif
 
-libmingle_C_la_SOURCES = edge_bundling.c ink.c agglomerative_bundling.c nearest_neighbor_graph.c nearest_neighbor_graph_ann.cpp
+libmingle_C_la_SOURCES = edge_bundling.c ink.cpp agglomerative_bundling.c \
+  nearest_neighbor_graph.c nearest_neighbor_graph_ann.cpp
 
 EXTRA_DIST = minglelib.vcxproj*
  

diff --git a/lib/mingle/ink.c b/lib/mingle/ink.cpp
similarity index 100%
rename from lib/mingle/ink.c
rename to lib/mingle/ink.cpp

diff --git a/lib/mingle/minglelib.vcxproj b/lib/mingle/minglelib.vcxproj
index 6bd6c2ac7a007e883c0d526d8c835e1cab1c0f25..1fbff524799026c64fea19f27b4bd5410d53a673 100644 (file)
--- a/lib/mingle/minglelib.vcxproj
+++ b/lib/mingle/minglelib.vcxproj
@@ -101,7 +101,7 @@
   <ItemGroup>
     <ClCompile Include="agglomerative_bundling.c" />
     <ClCompile Include="edge_bundling.c" />
-    <ClCompile Include="ink.c" />
+    <ClCompile Include="ink.cpp" />
     <ClCompile Include="nearest_neighbor_graph.c" />
     <ClCompile Include="nearest_neighbor_graph_ann.cpp" />
   </ItemGroup>

diff --git a/lib/mingle/minglelib.vcxproj.filters b/lib/mingle/minglelib.vcxproj.filters
index c60aedd5195c36281c8fbf6434cd0d98b7da5289..626b74b62dd10ff3627bd3466f8633c9aebefc5a 100644 (file)
--- a/lib/mingle/minglelib.vcxproj.filters
+++ b/lib/mingle/minglelib.vcxproj.filters
@@ -21,7 +21,7 @@
     <ClCompile Include="edge_bundling.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ink.c">
+    <ClCompile Include="ink.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="nearest_neighbor_graph.c">