Fix gcc issues relating to boost geometries

icsm-au · May 19, 2023 · 6e730fa · 6e730fa
1 parent f6d6c4a
commit 6e730fa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/dynadjust/dynadjust/dnareftran/dnareftran.hpp b/dynadjust/dynadjust/dnareftran/dnareftran.hpp
@@ -32,6 +32,8 @@
 #include <exception>
 #include <stdexcept>
 
+#include <include/measurement_types/dnageometries.hpp>
+
 #include <boost/shared_ptr.hpp>
 #include <boost/timer/timer.hpp>
 #include <boost/chrono/time_point.hpp>
@@ -74,7 +76,6 @@ using namespace boost::filesystem;
 
 #include <include/math/dnamatrix_contiguous.hpp>
 #include <include/measurement_types/dnameasurement.hpp>
-#include <include/measurement_types/dnageometries.hpp>
 
 using namespace dynadjust::measurements;
 using namespace dynadjust::exception;

diff --git a/dynadjust/dynadjust/dnareftranwrapper/dnareftranwrapper.hpp b/dynadjust/dynadjust/dnareftranwrapper/dnareftranwrapper.hpp
@@ -37,6 +37,8 @@
 #include <string>
 #include <time.h>
 
+#include <dynadjust/dnareftran/dnareftran.hpp>
+
 #include <boost/timer/timer.hpp>
 #include <boost/date_time/local_time/local_time.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
@@ -60,7 +62,6 @@
 #include <include/functions/dnafilepathfuncs.hpp>
 #include <include/functions/dnastrmanipfuncs.hpp>
 
-#include <dynadjust/dnareftran/dnareftran.hpp>
 
 using namespace std;
 using namespace boost;

diff --git a/dynadjust/include/io/dnaiotpb.cpp b/dynadjust/include/io/dnaiotpb.cpp
@@ -262,8 +262,7 @@ bool dna_io_tpb::validate_plate_files(v_string_v_doubledouble_pair& global_plate
 	it_v_string_v_doubledouble_pair j = global_plates.begin();
 
 	for (it_plate_motion_euler i = plate_pole_parameters.begin();
-		i != plate_pole_parameters.end(),
-		j != global_plates.end();
+		i != plate_pole_parameters.end() && j != global_plates.end();
 		++i, ++j)
 	{
 		if (!boost::equals(i->plate_name, j->first))