From 3ffaeb756452a12549da3ebd256ef323991eb696 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 15 Jan 2022 13:11:09 -0800 Subject: [PATCH] agglomerative_bundling.c: move into C++ This completes moving all of lib/mingle into C++. Closes #2154. --- lib/mingle/CMakeLists.txt | 2 +- lib/mingle/Makefile.am | 2 +- .../{agglomerative_bundling.c => agglomerative_bundling.cpp} | 0 lib/mingle/minglelib.vcxproj | 2 +- lib/mingle/minglelib.vcxproj.filters | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename lib/mingle/{agglomerative_bundling.c => agglomerative_bundling.cpp} (100%) diff --git a/lib/mingle/CMakeLists.txt b/lib/mingle/CMakeLists.txt index 9fa1abb7c..e5eba2543 100644 --- 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 a04f26020..47b865132 100644 --- 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 e8507bc36..c005e116d 100644 --- a/lib/mingle/minglelib.vcxproj +++ b/lib/mingle/minglelib.vcxproj @@ -99,7 +99,7 @@ - + diff --git a/lib/mingle/minglelib.vcxproj.filters b/lib/mingle/minglelib.vcxproj.filters index 1ad11e134..a539a9088 100644 --- a/lib/mingle/minglelib.vcxproj.filters +++ b/lib/mingle/minglelib.vcxproj.filters @@ -15,7 +15,7 @@ - + Source Files -- 2.40.0