* Updated MADARA to build with c++17 spec

* Removed pugi and all dependencies
jredmondson · Mar 25, 2023 · 5e31fc6 · 5e31fc6
1 parent 92fc979
commit 5e31fc6
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 14,315 deletions.
diff --git a/Madara.mpc b/Madara.mpc
@@ -21,7 +21,7 @@ project (Madara) : build_files, using_splice, splice_transport, using_ndds, mada
   libpaths += $(MADARA_ROOT)/lib
 
   verbatim (make, local, true) {
-    CPPFLAGS := -std=c++14 -O3 $(CPPFLAGS)
+    CPPFLAGS := -std=c++17 -O3 $(CPPFLAGS)
   }
 
   Build_Files {
@@ -85,7 +85,6 @@ project (Madara) : build_files, using_splice, splice_transport, using_ndds, mada
     include/madara/utility/Utility.cpp
     include/madara/utility/SimTime.cpp
     include/madara/utility/Refcounter.cpp
-    include/pugi
   }
 
   Header_Files {
@@ -114,7 +113,6 @@ project (Madara) : build_files, using_splice, splice_transport, using_ndds, mada
     include/madara/MadaraExport.h
     include/madara/LockType.h
     include/madara/Namespaces.h
-    include/pugi
   }
 }
 

diff --git a/Tests.mpc b/Tests.mpc
@@ -17,24 +17,6 @@ project (Test_Multicast_Mutex) : using_madara, no_karl, no_xml, null_lock, using
   }
 }
 
-project (Test_Pugi) : using_madara, no_karl, no_xml, null_lock, using_simtime {
-  exeout = $(MADARA_ROOT)/bin
-  exename = test_pugi
-
-
-  requires += tests
-
-  Documentation_Files {
-  }
-
-  Header_Files {
-  }
-
-  Source_Files {
-    tests/test_pugi.cpp
-  }
-}
-
 project (TestMulticastCloseAndAttach) : using_madara, no_karl, no_xml, null_lock, using_simtime {
   exeout = $(MADARA_ROOT)/bin
   exename = test_multicast_close_and_attach

diff --git a/include/pugi/pugiconfig.hpp b/include/pugi/pugiconfig.hpp