[Liblas-commits] hg: silence some msvc warnings

[liblas-commits at liblas.org]

changeset dee289df7f2e in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=dee289df7f2e
summary: silence some msvc warnings

diffstat:

 apps/kdx_util.cpp |  3 ++-
 apps/kdx_util.hpp |  4 ++++
 apps/oci_util.cpp |  2 +-
 apps/oci_util.hpp |  1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diffs (65 lines):

diff -r b7bbdf3c4604 -r dee289df7f2e apps/kdx_util.cpp
--- a/apps/kdx_util.cpp	Thu Aug 26 20:33:30 2010 -0500
+++ b/apps/kdx_util.cpp	Thu Aug 26 20:46:51 2010 -0500
@@ -2,6 +2,7 @@
 
 KDXIndexSummary::KDXIndexSummary(liblas::Reader& reader, boost::uint32_t capacity, bool verbose)
 {
+    boost::ignore_unused_variable_warning(verbose);    
     liblas::chipper::Chipper c(&reader, capacity);
 
 
@@ -181,7 +182,7 @@
             
             bool gotdata = GetPointData(p, point_data);
             
-            if (!gotdata) { throw std::runtime_error("Unable to fetch Point Data"); exit(1);}
+            if (!gotdata) { throw std::runtime_error("Unable to fetch Point Data"); }
             std::vector<boost::uint8_t>::const_iterator d;
             for (d = point_data.begin(); d!=point_data.end(); ++d) {
                 data.push_back(*d);
diff -r b7bbdf3c4604 -r dee289df7f2e apps/kdx_util.hpp
--- a/apps/kdx_util.hpp	Thu Aug 26 20:33:30 2010 -0500
+++ b/apps/kdx_util.hpp	Thu Aug 26 20:46:51 2010 -0500
@@ -2,7 +2,11 @@
 #define KDX_UTIL_HPP_INCLUDED
 
 #include <boost/shared_ptr.hpp>
+#include <boost/cstdint.hpp>
+#include <boost/concept_check.hpp>
+
 #include <liblas/liblas.hpp>
+#include <liblas/detail/fwd.hpp>
 #include "chipper.hpp"
 
 #include <fstream>
diff -r b7bbdf3c4604 -r dee289df7f2e apps/oci_util.cpp
--- a/apps/oci_util.cpp	Thu Aug 26 20:33:30 2010 -0500
+++ b/apps/oci_util.cpp	Thu Aug 26 20:46:51 2010 -0500
@@ -21,7 +21,6 @@
     {
         delete istrm;
         throw std::runtime_error("Reading stream was not able to be created");
-        exit(1);
     }
     return istrm;
 }
@@ -198,6 +197,7 @@
                         long srid, 
                         bool bUse3d)
 {
+    boost::ignore_unused_variable_warning(srid);    
     std::ostringstream oss;
     OWStatement* statement = 0;
     
diff -r b7bbdf3c4604 -r dee289df7f2e apps/oci_util.hpp
--- a/apps/oci_util.hpp	Thu Aug 26 20:33:30 2010 -0500
+++ b/apps/oci_util.hpp	Thu Aug 26 20:46:51 2010 -0500
@@ -12,6 +12,7 @@
 #include <algorithm>
 
 #include <boost/cstdint.hpp>
+#include <boost/concept_check.hpp>
 
 std::istream* OpenInput(std::string filename, bool bEnd);
 std::string ReadSQLData(std::string filename);