proj error checking code only works with recent proj versions #15618

eclipse-sumo · Oct 27, 2024 · 9cbe9fc · 9cbe9fc
1 parent f0fcde3
commit 9cbe9fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/utils/geom/GeoConvHelper.cpp b/src/utils/geom/GeoConvHelper.cpp
@@ -357,6 +357,7 @@ GeoConvHelper::cartesian2geo(Position& cartesian) const {
 
 
 #ifdef PROJ_API_FILE
+#ifdef PROJ_VERSION_MAJOR
 bool
 GeoConvHelper::checkError(projPJ projection) const {
     const int err_no = proj_context_errno(PJ_DEFAULT_CTX);
@@ -375,6 +376,7 @@ GeoConvHelper::checkError(projPJ projection) const {
     return true;
 }
 #endif
+#endif
 
 
 bool

diff --git a/src/utils/geom/GeoConvHelper.h b/src/utils/geom/GeoConvHelper.h
@@ -184,7 +184,9 @@ class GeoConvHelper {
 #ifdef PROJ_API_FILE
     void initProj(const std::string& proj);
 
+#ifdef PROJ_VERSION_MAJOR
     bool checkError(projPJ projection) const;
+#endif
 
     /// @brief The proj.4-projection to use
     projPJ myProjection;