From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Thu, 6 Jan 2022 04:32:31 +0000 (-0800)
Subject: lib/mingle: move ink.c into C++
X-Git-Tag: 3.0.0~88^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7325b163121cc8fd29fab7c9eed7bf2fa288dfb;p=graphviz

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 f475dc973..51fd40336 100644
--- 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 c6f664730..b79e74a2b 100644
--- 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 6bd6c2ac7..1fbff5247 100644
--- 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 c60aedd51..626b74b62 100644
--- 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">