[Liblas-commits] hg-main-tree: lint, for builds without GDAL

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/98ae80605e4e
changeset: 814:98ae80605e4e
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Mon Jun 27 12:56:41 2011 -0700
description:
lint, for builds without GDAL

diffstat:

 src/SpatialReference.cpp                 |   6 ++++++
 src/drivers/las/VariableLengthRecord.cpp |   6 ++++++
 src/filters/ReprojectionFilter.cpp       |  10 ++++++++--
 3 files changed, 20 insertions(+), 2 deletions(-)

diffs (95 lines):

diff -r 533f0b8c911e -r 98ae80605e4e src/SpatialReference.cpp
--- a/src/SpatialReference.cpp	Mon Jun 27 12:30:57 2011 -0700
+++ b/src/SpatialReference.cpp	Mon Jun 27 12:56:41 2011 -0700
@@ -37,6 +37,7 @@
 
 #include <boost/concept_check.hpp>
 #include <boost/property_tree/xml_parser.hpp>
+#include <boost/concept_check.hpp> // ignore_unused_variable_warning
 
 
 // gdal
@@ -279,6 +280,7 @@
     return (output==1);
     
 #else
+    boost::ignore_unused_variable_warning(input);
     throw pdal_error ("SpatialReference equality testing not available without GDAL+libgeotiff support");
 #endif
 
@@ -295,6 +297,8 @@
     return ostr;
 
 #else
+    boost::ignore_unused_variable_warning(ostr);
+    boost::ignore_unused_variable_warning(srs);
     throw pdal_error ("SpatialReference io operator<< is not available without GDAL+libgeotiff support");
 #endif
 }
@@ -329,6 +333,8 @@
     return istr;
     
 #else
+    boost::ignore_unused_variable_warning(istr);
+    boost::ignore_unused_variable_warning(srs);
     throw pdal_error ("SpatialReference io operator>> is not available without GDAL+libgeotiff support");
 #endif
 }
diff -r 533f0b8c911e -r 98ae80605e4e src/drivers/las/VariableLengthRecord.cpp
--- a/src/drivers/las/VariableLengthRecord.cpp	Mon Jun 27 12:30:57 2011 -0700
+++ b/src/drivers/las/VariableLengthRecord.cpp	Mon Jun 27 12:56:41 2011 -0700
@@ -34,6 +34,8 @@
 
 #include <pdal/drivers/las/VariableLengthRecord.hpp>
 
+#include <boost/concept_check.hpp> // ignore_unused_variable_warning
+
 #include <pdal/SpatialReference.hpp>
 #include "GeotiffSupport.hpp"
 
@@ -288,6 +290,9 @@
     const std::string wkt = geotiff.getWkt(false,false);
 
     srs.setFromUserInput(wkt);
+#else
+    boost::ignore_unused_variable_warning(srs);
+    boost::ignore_unused_variable_warning(vlrs);
 #endif
     return true;
 }
@@ -437,6 +442,7 @@
          vlrs.push_back(record);
     }
 #endif
+    boost::ignore_unused_variable_warning(modeFlag);
 
     std::string wkt = srs.getWKT( SpatialReference::eCompoundOK );
 
diff -r 533f0b8c911e -r 98ae80605e4e src/filters/ReprojectionFilter.cpp
--- a/src/filters/ReprojectionFilter.cpp	Mon Jun 27 12:30:57 2011 -0700
+++ b/src/filters/ReprojectionFilter.cpp	Mon Jun 27 12:56:41 2011 -0700
@@ -34,6 +34,8 @@
 
 #include <pdal/filters/ReprojectionFilter.hpp>
 
+#include <boost/concept_check.hpp> // ignore_unused_variable_warning
+
 #include <pdal/Dimension.hpp>
 #include <pdal/Schema.hpp>
 #include <pdal/exceptions.hpp>
@@ -197,9 +199,13 @@
         msg << "Could not project point for ReprojectionTransform::" << CPLGetLastErrorMsg() << ret;
         throw std::runtime_error(msg.str());
     }
-    
+#else
+    boost::ignore_unused_variable_warning(x);
+    boost::ignore_unused_variable_warning(y);
+    boost::ignore_unused_variable_warning(z);
+#endif
+ 
     return;
-#endif
 }