[Liblas-commits] hg: clean up more unused warnings

[liblas-commits at liblas.org]

changeset eb730f89acdf in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=eb730f89acdf
summary: clean up more unused warnings

diffstat:

 apps/las2oci.cpp |  15 +++++----------
 apps/las2oci.hpp |   1 +
 2 files changed, 6 insertions(+), 10 deletions(-)

diffs (104 lines):

diff -r dee289df7f2e -r eb730f89acdf apps/las2oci.cpp
--- a/apps/las2oci.cpp	Thu Aug 26 20:46:51 2010 -0500
+++ b/apps/las2oci.cpp	Thu Aug 26 21:08:39 2010 -0500
@@ -22,7 +22,7 @@
 void OCIGDALErrorHandler(CPLErr eErrClass, int err_no, const char *msg)
 {
     ostringstream oss;
-    oss <<"GDAL Error #" << err_no << ": " << msg;
+    oss <<"GDAL Error: type=" << eErrClass << " no=" << err_no << ": " << msg;
     throw std::runtime_error(oss.str());
 }
 
@@ -167,11 +167,9 @@
 
 bool InsertBlock(OWConnection* connection, 
                 IndexResult& result, 
-                long block_index,
                 int srid, 
                 liblas::Reader* reader, 
-                const char* tableName, 
-                long precision,
+                const char* tableName,
                 long pc_id,
                 bool bUseSolidGeometry,
                 bool bUse3d)
@@ -295,7 +293,6 @@
                 const std::string& table_name, 
                 long nCommitInterval, 
                 int srid, 
-                long precision,
                 long pc_id,
                 bool bUseSolidGeometry,
                 bool bUse3d,
@@ -327,11 +324,9 @@
     {        
         inserted = InsertBlock(con, 
                                     *i,
-                                    j, 
                                     srid, 
                                     reader2, 
                                     table_name.c_str(), 
-                                    precision, 
                                     pc_id, 
                                     bUseSolidGeometry, 
                                     bUse3d);
@@ -345,7 +340,6 @@
                         KDXIndexSummary* query, 
                         long srid, 
                         long precision,
-                        bool bUseSolidGeometry,
                         bool bUse3d,
                         bool bSetExtents,
                         liblas::Bounds<double> const& bounds)
@@ -892,6 +886,7 @@
                 pre_sql = ReadSQLData(sql);
                 used_file = true;
             } catch (std::runtime_error const& e) {
+                boost::ignore_unused_variable_warning(e);
                 pre_sql = std::string(sql);
                 used_file = false;
             }
@@ -909,6 +904,7 @@
                 post_sql = ReadSQLData(sql);
                 used_file = true;
             } catch (std::runtime_error const& e) {
+                boost::ignore_unused_variable_warning(e);
                 post_sql = std::string(sql);
                 used_file = false;
             }
@@ -926,6 +922,7 @@
                 pre_block_sql = ReadSQLData(sql);
                 used_file = true;
             } catch (std::runtime_error const& e) {
+                boost::ignore_unused_variable_warning(e);
                 pre_block_sql = std::string(sql);
                 used_file = false;
             }
@@ -1203,7 +1200,6 @@
                      block_table_name,
                      nCommitInterval,
                      srid,
-                     precision,
                      pc_id,
                      bUseSolidGeometry,
                      bUse3d,
@@ -1218,7 +1214,6 @@
                             query, 
                             srid , 
                             precision, 
-                            bUseSolidGeometry,
                             bUse3d,
                             bSetExtents,
                             global_extent);
diff -r dee289df7f2e -r eb730f89acdf apps/las2oci.hpp
--- a/apps/las2oci.hpp	Thu Aug 26 20:46:51 2010 -0500
+++ b/apps/las2oci.hpp	Thu Aug 26 21:08:39 2010 -0500
@@ -12,6 +12,7 @@
 
 #include <liblas/liblas.hpp>
 #include <boost/cstdint.hpp>
+#include <boost/concept_check.hpp>
 
 #include <string>
 #include <sstream>