[Liblas-commits] hg: 2 new changesets

[liblas-commits at liblas.org]

changeset 4a9fb47f8346 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=4a9fb47f8346
summary: Disable Visual C++ warning C4512 for Boost libs.

changeset 642cbc59905a in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=642cbc59905a
summary: Removed doubled declaration of DimensionPtr object.

diffstat:

 apps/lasblock.cpp |  13 +++++++++----
 src/laspoint.cpp  |   2 --
 src/lasschema.cpp |   5 +++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r af0e4d93cbe5 -r 642cbc59905a apps/lasblock.cpp
--- a/apps/lasblock.cpp	Fri Oct 01 14:28:46 2010 -0500
+++ b/apps/lasblock.cpp	Mon Oct 04 15:54:03 2010 +0100
@@ -14,6 +14,15 @@
 // std
 #include <fstream>
 #include <vector>
+// boost
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4512)
+#include <boost/program_options.hpp>
+#pragma warning(pop)
+#endif
+
+namespace po = boost::program_options;
 
 #ifdef _WIN32
 #define compare_no_case(a,b,n)  _strnicmp( (a), (b), (n) )
@@ -21,10 +30,6 @@
 #define compare_no_case(a,b,n)  strncasecmp( (a), (b), (n) )
 #endif
 
-#include <boost/program_options.hpp>
-
-namespace po = boost::program_options;
-
 bool term_progress(std::ostream& os, double complete)
 {
     static int lastTick = -1;
diff -r af0e4d93cbe5 -r 642cbc59905a src/laspoint.cpp
--- a/src/laspoint.cpp	Fri Oct 01 14:28:46 2010 -0500
+++ b/src/laspoint.cpp	Mon Oct 04 15:54:03 2010 +0100
@@ -552,8 +552,6 @@
     
     std::vector<boost::uint8_t> data;
 
-    DimensionPtr t;
-    
     std::vector<DimensionPtr> positions;
     for (DimensionMap::const_iterator i = dimensions.begin(); i != dimensions.end(); ++i)
     {
diff -r af0e4d93cbe5 -r 642cbc59905a src/lasschema.cpp
--- a/src/lasschema.cpp	Fri Oct 01 14:28:46 2010 -0500
+++ b/src/lasschema.cpp	Mon Oct 04 15:54:03 2010 +0100
@@ -41,7 +41,12 @@
 
 #include <liblas/lasschema.hpp>
 #include <liblas/detail/utility.hpp>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4512)
 #include <liblas/external/property_tree/xml_parser.hpp>
+#pragma warning(pop)
+#endif
 // boost
 #include <boost/cstdint.hpp>
 // std