[Liblas-commits] hg: Removed incorrect IndexCell declaration with no effect - hea...

[liblas-commits at liblas.org]

changeset 42fdf036b4bd in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=42fdf036b4bd
summary: Removed incorrect IndexCell declaration with no effect - header file included anyway. Replaced preprocessor definitions with regular constants - DO NOT USE macros in public headers. Tidy up.

diffstat:

 include/liblas/lasindex.hpp |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (33 lines):

diff -r 9c65794516cf -r 42fdf036b4bd include/liblas/lasindex.hpp
--- a/include/liblas/lasindex.hpp	Wed Aug 18 12:51:09 2010 -0600
+++ b/include/liblas/lasindex.hpp	Wed Aug 18 21:13:42 2010 +0100
@@ -50,23 +50,22 @@
 // boost
 #include <boost/cstdint.hpp>
 // std
+#include <cstddef> // std::size_t
+#include <cstdio>
+#include <iostream>
 #include <stdexcept> // std::out_of_range
-#include <cstdio>	// file io
-#include <iostream>	// file io
-#include <cstdlib> // std::size_t
 #include <vector> // std::vector
 
 namespace liblas {
 
-#define LIBLAS_INDEX_MAXMEMDEFAULT	10000000	// 10 megs default
-#define LIBLAS_INDEX_VERSIONMAJOR	1
-#define LIBLAS_INDEX_VERSIONMINOR	0
+std::size_t const LIBLAS_INDEX_MAXMEMDEFAULT = 10 * 1024 * 1024; // 10 megs default
+int const LIBLAS_INDEX_VERSIONMAJOR = 1;
+int const LIBLAS_INDEX_VERSIONMINOR = 0;
 
 typedef std::vector<boost::uint8_t> IndexVLRData;
 typedef std::vector<liblas::detail::IndexCell> IndexCellRow;
 typedef std::vector<IndexCellRow>	IndexCellDataBlock;
 
-class liblas::detail::IndexCell;
 class IndexData;
 
 /// Point data record composed with X, Y, Z coordinates and attributes.