diff --git a/build-script.sh b/build-script.sh index 893c959..7dfc13e 100755 --- a/build-script.sh +++ b/build-script.sh @@ -7,8 +7,8 @@ echo " " echo "Compiling component .cpp files..." #g++ -c -g simpcomp.cpp ksimplex.cpp color.cpp input-and-output.cpp seed.cpp pachner.cpp -#g++ -std=c++11 -c -g -Wpedantic -Wall -Wextra -Wshadow -Wformat=2 -Wunused triangulator.cpp simpcomp.cpp ksimplex.cpp color.cpp input-and-output.cpp seed.cpp pachner.cpp -g++ -std=c++11 -c -g -Wformat=2 triangulator.cpp simpcomp.cpp ksimplex.cpp color.cpp input-and-output.cpp seed.cpp pachner.cpp +#g++ -std=c++11 -c -g -Wpedantic -Wall -Wextra -Wshadow -Wformat=2 -Wunused global-vars.cpp simpcomp.cpp ksimplex.cpp color.cpp input-and-output.cpp seed.cpp pachner.cpp +g++ -std=c++11 -c -g -Wformat=2 global-vars.cpp simpcomp.cpp ksimplex.cpp color.cpp input-and-output.cpp seed.cpp pachner.cpp echo "... done." echo " " @@ -19,7 +19,7 @@ echo " " echo "Creating triangulator-library.a from component object files..." rm -f triangulator-library.a -ar rcs triangulator-library.a triangulator.o simpcomp.o ksimplex.o color.o input-and-output.o seed.o pachner.o +ar rcs triangulator-library.a global-vars.o simpcomp.o ksimplex.o color.o input-and-output.o seed.o pachner.o echo "... done. " echo " " @@ -29,7 +29,7 @@ echo " " echo "Cleaning up temporary object files..." -rm triangulator.o simpcomp.o ksimplex.o color.o input-and-output.o seed.o pachner.o +rm global-vars.o simpcomp.o ksimplex.o color.o input-and-output.o seed.o pachner.o echo "... done. " echo " " diff --git a/triangulator.cpp b/global-vars.cpp similarity index 100% rename from triangulator.cpp rename to global-vars.cpp diff --git a/global-vars.hpp b/global-vars.hpp new file mode 100644 index 0000000..3d4d2a3 --- /dev/null +++ b/global-vars.hpp @@ -0,0 +1,10 @@ + +using namespace std; + +#include + +namespace triangulator_global{ + // Vector of all instantiated simplicial complexes: + extern vector seededComplexes; +} + diff --git a/seed.cpp b/seed.cpp index ed20f7e..2fd3314 100644 --- a/seed.cpp +++ b/seed.cpp @@ -271,7 +271,6 @@ SimpComp* seed_sphere_intuitively(int D, string name){ // Decrease the dimension of simpComp: simpComp->D--; - triangulator_global::seededComplexes.push_back(simpComp); return simpComp; } diff --git a/triangulator.hpp b/triangulator.hpp index 23d8f38..0f7c119 100644 --- a/triangulator.hpp +++ b/triangulator.hpp @@ -20,9 +20,6 @@ using namespace std; #include "seed.hpp" #include "input-and-output.hpp" #include "pachner.hpp" +#include "global-vars.hpp" -namespace triangulator_global{ - // Vector of all instantiated simplicial complexes: - extern vector seededComplexes; -}