[Liblas-commits] hg-main-tree: fix vs2010 build

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/625c9882869a
changeset: 553:625c9882869a
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Wed Apr 13 10:57:56 2011 -0700
description:
fix vs2010 build
Subject: hg-main-tree: merge

details:   http://hg.libpc.orghg-main-tree/rev/ecdf00941504
changeset: 554:ecdf00941504
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Wed Apr 13 10:58:09 2011 -0700
description:
merge

diffstat:

 apps/pc2pc.cpp                          |   2 +-
 include/libpc/drivers/oci/Common.hpp    |  11 ++++++++++-
 include/libpc/drivers/oci/oci_wrapper.h |   6 ++++--
 src/drivers/oci/common.cpp              |   6 ++++--
 4 files changed, 19 insertions(+), 6 deletions(-)

diffs (95 lines):

diff -r 033bb6a053b5 -r ecdf00941504 apps/pc2pc.cpp
--- a/apps/pc2pc.cpp	Wed Apr 13 10:50:37 2011 -0700
+++ b/apps/pc2pc.cpp	Wed Apr 13 10:58:09 2011 -0700
@@ -182,7 +182,7 @@
 
 
 
-            libpc::drivers::liblas::LiblasWriter writer(reader, *ofs);
+            libpc::drivers::las::LasWriter writer(reader, *ofs);
             // writer.setPointFormat( 3);
             writer.write(numPoints);
     #else
diff -r 033bb6a053b5 -r ecdf00941504 include/libpc/drivers/oci/Common.hpp
--- a/include/libpc/drivers/oci/Common.hpp	Wed Apr 13 10:50:37 2011 -0700
+++ b/include/libpc/drivers/oci/Common.hpp	Wed Apr 13 10:58:09 2011 -0700
@@ -36,6 +36,7 @@
 #define INCLUDED_DRIVER_OCI_COMMON_HPP
 
 #include <libpc/libpc.hpp>
+#include <libpc/exceptions.hpp>
 
 #include "oci_wrapper.h"
 #include "Endian.hpp"
@@ -59,6 +60,14 @@
 typedef boost::shared_ptr<OWStatement> Statement ;
 
 
+// use this for code still under development
+class connection_failed : public libpc_error
+{
+public:
+    connection_failed(std::string const& msg)
+        : libpc_error(msg)
+    {}
+};
 
 
 #ifdef LIBPC_COMPILER_MSVC
@@ -129,7 +138,7 @@
     boost::property_tree::ptree const& GetPTree() const {return m_tree; }
 };
 
-Connection Connect(Options const& options);
+LIBPC_DLL Connection Connect(Options const& options);
 
 std::string to_upper(std::string const& input);
 
diff -r 033bb6a053b5 -r ecdf00941504 include/libpc/drivers/oci/oci_wrapper.h
--- a/include/libpc/drivers/oci/oci_wrapper.h	Wed Apr 13 10:50:37 2011 -0700
+++ b/include/libpc/drivers/oci/oci_wrapper.h	Wed Apr 13 10:58:09 2011 -0700
@@ -31,6 +31,8 @@
 #ifndef _OCI_WRAPPER_H_INCLUDED
 #define _OCI_WRAPPER_H_INCLUDED
 
+#include <libpc/export.hpp>
+
 // GDAL supporting types
 
 #include "gdal.h"
@@ -291,7 +293,7 @@
 //  OWConnection
 //  ---------------------------------------------------------------------------
 
-class OWConnection
+class LIBPC_DLL OWConnection
 {
     friend class OWStatement;
 
@@ -377,7 +379,7 @@
 /*                           OWStatement                                   */
 /***************************************************************************/
 
-class OWStatement
+class LIBPC_DLL OWStatement
 {
 
 public:
diff -r 033bb6a053b5 -r ecdf00941504 src/drivers/oci/common.cpp
--- a/src/drivers/oci/common.cpp	Wed Apr 13 10:50:37 2011 -0700
+++ b/src/drivers/oci/common.cpp	Wed Apr 13 10:58:09 2011 -0700
@@ -199,10 +199,12 @@
     Connection con = boost::make_shared<OWConnection>(username.c_str(),password.c_str(),instance.c_str());
     
     if (con->Succeeded())
+    {
         if (verbose)
-            std::cout << "Oracle connection succeeded" << std::endl;
+            std::cout << "Oracle connection succeeded" << std::endl;        
+    }
     else
-        throw libpc_error("Oracle connection failed");
+        throw connection_failed("Oracle connection failed");
         
     return con;