[Liblas-commits] r1291 - in trunk: include/liblas/index src/index

[liblas-commits at liblas.org]

Author: hobu
Date: Thu May 28 15:12:14 2009
New Revision: 1291
URL: http://liblas.org/changeset/1291

Log:
fixup includes

Modified:
   trunk/include/liblas/index/datastream.hpp
   trunk/include/liblas/index/index.hpp
   trunk/include/liblas/index/storage.hpp
   trunk/include/liblas/index/visitor.hpp
   trunk/src/index/visitor.cpp

Modified: trunk/include/liblas/index/datastream.hpp
==============================================================================
--- trunk/include/liblas/index/datastream.hpp	(original)
+++ trunk/include/liblas/index/datastream.hpp	Thu May 28 15:12:14 2009
@@ -45,8 +45,12 @@
 #include <liblas/lasvariablerecord.hpp>
 #include <liblas/laspoint.hpp>
 
-#include <spatialindex/SpatialIndex.h>
 
+#ifndef _MSC_VER
+#include <spatialindex/SpatialIndex.h>
+#else
+#include <SpatialIndex.h>
+#endif
 
 //std
 #include <string>

Modified: trunk/include/liblas/index/index.hpp
==============================================================================
--- trunk/include/liblas/index/index.hpp	(original)
+++ trunk/include/liblas/index/index.hpp	Thu May 28 15:12:14 2009
@@ -44,7 +44,12 @@
 
 #include <liblas/laspoint.hpp>
 
+
+#ifndef _MSC_VER
 #include <spatialindex/SpatialIndex.h>
+#else
+#include <SpatialIndex.h>
+#endif
 
 #include <liblas/index/datastream.hpp>
 #include <liblas/index/storage.hpp>

Modified: trunk/include/liblas/index/storage.hpp
==============================================================================
--- trunk/include/liblas/index/storage.hpp	(original)
+++ trunk/include/liblas/index/storage.hpp	Thu May 28 15:12:14 2009
@@ -43,9 +43,14 @@
 #define LIBLAS_INDEX_STORAGE_HPP_INCLUDED
 
 #include <liblas/lasvariablerecord.hpp>
-#include <spatialindex/SpatialIndex.h>
 
 
+#ifndef _MSC_VER
+#include <spatialindex/SpatialIndex.h>
+#else
+#include <SpatialIndex.h>
+#endif
+
 //std
 #include <string>
 #include <vector>

Modified: trunk/include/liblas/index/visitor.hpp
==============================================================================
--- trunk/include/liblas/index/visitor.hpp	(original)
+++ trunk/include/liblas/index/visitor.hpp	Thu May 28 15:12:14 2009
@@ -42,8 +42,12 @@
 #ifndef LIBLAS_INDEX_VISITOR_HPP_INCLUDED
 #define LIBLAS_INDEX_VISITOR_HPP_INCLUDED
 
-#include <spatialindex/SpatialIndex.h>
 
+#ifndef _MSC_VER
+#include <spatialindex/SpatialIndex.h>
+#else
+#include <SpatialIndex.h>
+#endif
 
 //std
 #include <string>

Modified: trunk/src/index/visitor.cpp
==============================================================================
--- trunk/src/index/visitor.cpp	(original)
+++ trunk/src/index/visitor.cpp	Thu May 28 15:12:14 2009
@@ -39,7 +39,7 @@
  * OF SUCH DAMAGE.
  ****************************************************************************/
 
-#include <liblas/lasindex.hpp>
+#include <liblas/index/index.hpp>
 #include <liblas/cstdint.hpp>
 #include <liblas/guid.hpp>
 #include <liblas/lasreader.hpp>