[Liblas-commits] hg: Still improving the integer types names conflicts.

[liblas-commits at liblas.org]

changeset 817b83a7566b in /home/www/liblas.org/hg
details: http://hg.liblas.org/main/hg?cmd=changeset;node=817b83a7566b
summary: Still improving the integer types names conflicts.

diffstat:

 include/liblas/index/storage.hpp |  6 +++---
 src/index/storage.cpp            |  4 ++--
 src/index/visitor.cpp            |  4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (58 lines):

diff -r b3abc99e4902 -r 817b83a7566b include/liblas/index/storage.hpp
--- a/include/liblas/index/storage.hpp	Tue Oct 20 00:31:40 2009 +0100
+++ b/include/liblas/index/storage.hpp	Tue Oct 20 00:53:19 2009 +0100
@@ -70,8 +70,8 @@
 
     virtual ~VLRStorageManager();
 
-    virtual void loadByteArray(const SpatialIndex::id_type id, uint32_t& len, uint8_t** data);
-    virtual void storeByteArray(SpatialIndex::id_type& id, const uint32_t len, const uint8_t* const data);
+    virtual void loadByteArray(const SpatialIndex::id_type id, ::uint32_t& len, ::uint8_t** data);
+    virtual void storeByteArray(SpatialIndex::id_type& id, const ::uint32_t len, const ::uint8_t* const data);
     virtual void deleteByteArray(const SpatialIndex::id_type id);
     
     LASVariableRecord* getVLR() const;
@@ -100,7 +100,7 @@
     vlrbuffer_t m_vlrbuffer;
     std::stack<SpatialIndex::id_type> m_emptyPages;
 
-    LASVariableRecord* makeVLR(const std::size_t len, const uint8_t* data);
+    LASVariableRecord* makeVLR(const std::size_t len, const ::uint8_t* data);
 
 }; // MemoryStorageManager
 
diff -r b3abc99e4902 -r 817b83a7566b src/index/storage.cpp
--- a/src/index/storage.cpp	Tue Oct 20 00:31:40 2009 +0100
+++ b/src/index/storage.cpp	Tue Oct 20 00:53:19 2009 +0100
@@ -79,7 +79,7 @@
     }
 }
 
-void VLRStorageManager::loadByteArray(const SpatialIndex::id_type id, uint32_t& len, uint8_t** data)
+void VLRStorageManager::loadByteArray(const SpatialIndex::id_type id, ::uint32_t& len, ::uint8_t** data)
 {
     LASVariableRecord* v = 0;
     try
@@ -100,7 +100,7 @@
     std::memcpy(*data, &vlrdata[0], len);
 }
 
-void VLRStorageManager::storeByteArray(SpatialIndex::id_type& id, const uint32_t len, const uint8_t* const data)
+void VLRStorageManager::storeByteArray(SpatialIndex::id_type& id, const ::uint32_t len, const ::uint8_t* const data)
 {
     if (id == SpatialIndex::StorageManager::NewPage)
     {
diff -r b3abc99e4902 -r 817b83a7566b src/index/visitor.cpp
--- a/src/index/visitor.cpp	Tue Oct 20 00:31:40 2009 +0100
+++ b/src/index/visitor.cpp	Tue Oct 20 00:53:19 2009 +0100
@@ -81,8 +81,8 @@
     delete r;
 
     // data should be an array of characters representing a Region as a string.
-    uint8_t* pData = 0;
-    uint32_t cLen = 0;
+    ::uint8_t* pData = 0;
+    ::uint32_t cLen = 0;
     d.getData(cLen, &pData);
     // do something.
     //string s = reinterpret_cast<char*>(pData);