[Liblas-commits] laszip: merge

[liblas-commits at liblas.org]

changeset 755123ad7728 in /Volumes/Data/www/liblas.org/laszip
details: http://hg.liblas.orglaszip?cmd=changeset;node=755123ad7728
summary: merge

diffstat:

 include/laszip/laszipper.hpp  |  2 +-
 src/bytestreamin_istream.hpp  |  2 +-
 src/bytestreamout_ostream.hpp |  2 +-
 tools/laszippertest.cpp       |  2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 70aa87413dcb -r 755123ad7728 include/laszip/laszipper.hpp
--- a/include/laszip/laszipper.hpp	Wed Dec 15 05:11:54 2010 -0800
+++ b/include/laszip/laszipper.hpp	Wed Dec 15 06:38:48 2010 -0800
@@ -48,7 +48,7 @@
 
 #include <stdio.h>
 
-#ifdef _MSC_VER
+#if _MSC_VER < 1300
 #include <ostream.h>
 #else
 #include <fstream>
diff -r 70aa87413dcb -r 755123ad7728 src/bytestreamin_istream.hpp
--- a/src/bytestreamin_istream.hpp	Wed Dec 15 05:11:54 2010 -0800
+++ b/src/bytestreamin_istream.hpp	Wed Dec 15 06:38:48 2010 -0800
@@ -46,7 +46,7 @@
 
 #include "bytestreamin.hpp"
 
-#ifdef _MSC_VER
+#if _MSC_VER < 1300
 #include <istream.h>
 #else
 #include <fstream>
diff -r 70aa87413dcb -r 755123ad7728 src/bytestreamout_ostream.hpp
--- a/src/bytestreamout_ostream.hpp	Wed Dec 15 05:11:54 2010 -0800
+++ b/src/bytestreamout_ostream.hpp	Wed Dec 15 06:38:48 2010 -0800
@@ -46,7 +46,7 @@
 
 #include "bytestreamout.hpp"
 
-#ifdef _MSC_VER
+#if _MSC_VER < 1300
 #include <ostream.h>
 #else
 #include <fstream>
diff -r 70aa87413dcb -r 755123ad7728 tools/laszippertest.cpp
--- a/tools/laszippertest.cpp	Wed Dec 15 05:11:54 2010 -0800
+++ b/tools/laszippertest.cpp	Wed Dec 15 06:38:48 2010 -0800
@@ -48,7 +48,7 @@
 #include "laszipper.hpp"
 #include "lasunzipper.hpp"
 
-#ifdef _MSC_VER
+#if _MSC_VER < 1300
 #include <istream.h>
 #include <ostream.h>
 #include <fstream.h>