[Liblas-commits] hg-main-tree: remove extra ;'s

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/e0932b5843d6
changeset: 925:e0932b5843d6
user:      Howard Butler <hobu.inc at gmail.com>
date:      Mon Jul 25 13:04:50 2011 -0500
description:
remove extra ;'s
Subject: hg-main-tree: turn off INIT_OPTIONS, doesn't work on unix

details:   http://hg.libpc.orghg-main-tree/rev/cf56cd8a7a0e
changeset: 926:cf56cd8a7a0e
user:      Howard Butler <hobu.inc at gmail.com>
date:      Mon Jul 25 14:40:39 2011 -0500
description:
turn off INIT_OPTIONS, doesn't work on unix

diffstat:

 src/StageFactory.cpp           |   2 +-
 src/drivers/faux/Writer.cpp    |   2 +-
 src/filters/ByteSwapFilter.cpp |   2 +-
 src/filters/CacheFilter.cpp    |   2 +-
 test/unit/OptionsTest.cpp      |  36 ++++++++++++++++++------------------
 5 files changed, 22 insertions(+), 22 deletions(-)

diffs (94 lines):

diff -r f9d3625b0473 -r cf56cd8a7a0e src/StageFactory.cpp
--- a/src/StageFactory.cpp	Mon Jul 25 10:38:50 2011 -0700
+++ b/src/StageFactory.cpp	Mon Jul 25 14:40:39 2011 -0500
@@ -81,7 +81,7 @@
     Writer* create_##T(const Stage& prevStage, const Options& options) { return new FullT(prevStage, options); }
 
 MAKE_READER_CREATOR(FauxReader, pdal::drivers::faux::Reader)
-MAKE_READER_CREATOR(LasReader, pdal::drivers::las::LasReader);
+MAKE_READER_CREATOR(LasReader, pdal::drivers::las::LasReader)
 MAKE_READER_CREATOR(LiblasReader, pdal::drivers::liblas::LiblasReader)
 MAKE_READER_CREATOR(OciReader, pdal::drivers::oci::Reader)
 MAKE_READER_CREATOR(QfitReader, pdal::drivers::qfit::Reader)
diff -r f9d3625b0473 -r cf56cd8a7a0e src/drivers/faux/Writer.cpp
--- a/src/drivers/faux/Writer.cpp	Mon Jul 25 10:38:50 2011 -0700
+++ b/src/drivers/faux/Writer.cpp	Mon Jul 25 14:40:39 2011 -0500
@@ -41,7 +41,7 @@
 
     
 static Options s_defaultOptions;
-IMPLEMENT_STATICS(Writer, "drivers.faux.writer", "Faux Writer");
+IMPLEMENT_STATICS(Writer, "drivers.faux.writer", "Faux Writer")
 
 
 Writer::Writer(const Stage& prevStage, const Options& options)
diff -r f9d3625b0473 -r cf56cd8a7a0e src/filters/ByteSwapFilter.cpp
--- a/src/filters/ByteSwapFilter.cpp	Mon Jul 25 10:38:50 2011 -0700
+++ b/src/filters/ByteSwapFilter.cpp	Mon Jul 25 14:40:39 2011 -0500
@@ -48,7 +48,7 @@
 
 
 static Options s_defaultOptions;
-IMPLEMENT_STATICS(ByteSwapFilter, "filters.byteswap", "Crop Filter");
+IMPLEMENT_STATICS(ByteSwapFilter, "filters.byteswap", "Crop Filter")
 
 
 ByteSwapFilter::ByteSwapFilter(const Stage& prevStage, const Options& options)
diff -r f9d3625b0473 -r cf56cd8a7a0e src/filters/CacheFilter.cpp
--- a/src/filters/CacheFilter.cpp	Mon Jul 25 10:38:50 2011 -0700
+++ b/src/filters/CacheFilter.cpp	Mon Jul 25 14:40:39 2011 -0500
@@ -41,7 +41,7 @@
 
 
 static Options s_defaultOptions;
-IMPLEMENT_STATICS(CacheFilter, "filters.cache", "Cache Filter");
+IMPLEMENT_STATICS(CacheFilter, "filters.cache", "Cache Filter")
 
 
 CacheFilter::CacheFilter(const Stage& prevStage, const Options& options)
diff -r f9d3625b0473 -r cf56cd8a7a0e test/unit/OptionsTest.cpp
--- a/test/unit/OptionsTest.cpp	Mon Jul 25 10:38:50 2011 -0700
+++ b/test/unit/OptionsTest.cpp	Mon Jul 25 14:40:39 2011 -0500
@@ -48,24 +48,24 @@
 static std::string xml_str_ref = "<Name>my_string</Name><Description>This is my stringy option.</Description><Value>Yow.</Value>";
 
 
-INIT_OPTIONS(s_defaultOptions, \
-             (pdal::Option<std::string>("r","s","t")) \
-             (pdal::Option<std::string>("u","v","w")) \
-             (pdal::Option<std::string>("x","y","z")) )
-
-
-BOOST_AUTO_TEST_CASE(test_static_options)
-{
-    BOOST_CHECK(s_defaultOptions.hasOption<std::string>("r"));
-    BOOST_CHECK(s_defaultOptions.hasOption<std::string>("u"));
-    BOOST_CHECK(s_defaultOptions.hasOption<std::string>("x"));
-
-    const boost::property_tree::ptree& pt = s_defaultOptions.getPTree();
-    BOOST_CHECK(pt.size() == 3);
-
-    return;
-}
-
+// INIT_OPTIONS(s_defaultOptions, \
+//              (pdal::Option<std::string>("r","s","t")) \
+//              (pdal::Option<std::string>("u","v","w")) \
+//              (pdal::Option<std::string>("x","y","z")) )
+// 
+// 
+// BOOST_AUTO_TEST_CASE(test_static_options)
+// {
+//     BOOST_CHECK(s_defaultOptions.hasOption<std::string>("r"));
+//     BOOST_CHECK(s_defaultOptions.hasOption<std::string>("u"));
+//     BOOST_CHECK(s_defaultOptions.hasOption<std::string>("x"));
+// 
+//     const boost::property_tree::ptree& pt = s_defaultOptions.getPTree();
+//     BOOST_CHECK(pt.size() == 3);
+// 
+//     return;
+// }
+// 
 
 BOOST_AUTO_TEST_CASE(test_option_writing)
 {