[Liblas-commits] hg-main-tree: make libpc::driver::oci::Writer derive from libpc:...

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/bfdaf879884f
changeset: 273:bfdaf879884f
user:      Howard Butler <hobu.inc at gmail.com>
date:      Wed Mar 16 09:51:08 2011 -0500
description:
make libpc::driver::oci::Writer derive from libpc::Writer
Subject: hg-main-tree: merge

details:   http://hg.libpc.orghg-main-tree/rev/f92b016e5361
changeset: 274:f92b016e5361
user:      Howard Butler <hobu.inc at gmail.com>
date:      Wed Mar 16 09:51:26 2011 -0500
description:
merge

diffstat:

 apps/pc2pc.cpp                       |  2 +-
 include/libpc/drivers/oci/Writer.hpp |  2 +-
 src/drivers/oci/Writer.cpp           |  3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r ceb2773302bf -r f92b016e5361 apps/pc2pc.cpp
--- a/apps/pc2pc.cpp	Wed Mar 16 10:45:51 2011 -0400
+++ b/apps/pc2pc.cpp	Wed Mar 16 09:51:26 2011 -0500
@@ -139,7 +139,7 @@
         tree.put("debug", true);
         tree.put("verbose", true);
         
-        CacheFilter cache(reader, 1, 1024);
+        libpc::filters::CacheFilter cache(reader, 1, 1024);
         
         libpc::driver::oci::Writer writer(cache, options);
         
diff -r ceb2773302bf -r f92b016e5361 include/libpc/drivers/oci/Writer.hpp
--- a/include/libpc/drivers/oci/Writer.hpp	Wed Mar 16 10:45:51 2011 -0400
+++ b/include/libpc/drivers/oci/Writer.hpp	Wed Mar 16 09:51:26 2011 -0500
@@ -49,7 +49,7 @@
 
 
 
-class LIBPC_DLL Writer 
+class LIBPC_DLL Writer : public libpc::Writer
 {
     
 public:
diff -r ceb2773302bf -r f92b016e5361 src/drivers/oci/Writer.cpp
--- a/src/drivers/oci/Writer.cpp	Wed Mar 16 10:45:51 2011 -0400
+++ b/src/drivers/oci/Writer.cpp	Wed Mar 16 09:51:26 2011 -0500
@@ -52,7 +52,8 @@
 
 
 Writer::Writer(Stage& prevStage, Options& options)
-    : m_stage(prevStage)
+    : libpc::Writer(prevStage)
+    , m_stage(prevStage)
     , m_chipper(m_stage, options.GetPTree().get<boost::uint32_t>("capacity") )
     , m_options(options)
     , m_verbose(false)