agglomerative_bundling.c: move into C++

This completes moving all of lib/mingle into C++. Closes #2154.

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

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

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

diff --git a/lib/mingle/minglelib.vcxproj b/lib/mingle/minglelib.vcxproj
index e8507bc364323c313bbb98a3abea61d030ce4782..c005e116d2f583a88de2bb16057c8798f0b2714f 100644 (file)
--- a/lib/mingle/minglelib.vcxproj
+++ b/lib/mingle/minglelib.vcxproj
@@ -99,7 +99,7 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="agglomerative_bundling.c" />
+    <ClCompile Include="agglomerative_bundling.cpp" />
     <ClCompile Include="edge_bundling.cpp" />
     <ClCompile Include="ink.cpp" />
     <ClCompile Include="nearest_neighbor_graph.cpp" />

diff --git a/lib/mingle/minglelib.vcxproj.filters b/lib/mingle/minglelib.vcxproj.filters
index 1ad11e13409e303ed9fb6301adfed471edbbc023..a539a9088d7d311d86b1f07120d55d3d965d00e3 100644 (file)
--- a/lib/mingle/minglelib.vcxproj.filters
+++ b/lib/mingle/minglelib.vcxproj.filters
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="agglomerative_bundling.c">
+    <ClCompile Include="agglomerative_bundling.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="edge_bundling.cpp">