[Liblas-commits] hg-main-tree: add some more namespacing
liblas-commits at liblas.org
liblas-commits at liblas.org
Wed Mar 16 15:31:52 EDT 2011
details: http://hg.libpc.orghg-main-tree/rev/12658b49baeb
changeset: 291:12658b49baeb
user: Michael P. Gerlek <mpg at flaxen.com>
date: Wed Mar 16 15:31:35 2011 -0400
description:
add some more namespacing
Subject: hg-main-tree: merge
details: http://hg.libpc.orghg-main-tree/rev/84734bb4ec31
changeset: 292:84734bb4ec31
user: Michael P. Gerlek <mpg at flaxen.com>
date: Wed Mar 16 15:31:50 2011 -0400
description:
merge
diffstat:
apps/pc2pc.cpp | 8 ++--
apps/pcinfo.cpp | 4 +-
include/libpc/drivers/las/Header.hpp | 6 +-
include/libpc/drivers/las/Reader.hpp | 6 +-
include/libpc/drivers/las/Writer.hpp | 6 +-
include/libpc/drivers/liblas/Header.hpp | 6 +-
include/libpc/drivers/liblas/Reader.hpp | 7 +--
include/libpc/drivers/liblas/Writer.hpp | 9 ++---
src/drivers/las/Header.cpp | 9 +---
src/drivers/las/LasHeaderReader.cpp | 5 +-
src/drivers/las/LasHeaderReader.hpp | 6 +-
src/drivers/las/LasHeaderWriter.cpp | 9 +---
src/drivers/las/LasHeaderWriter.hpp | 6 +-
src/drivers/las/Reader.cpp | 6 +-
src/drivers/las/Writer.cpp | 6 +-
src/drivers/liblas/Header.cpp | 11 +----
src/drivers/liblas/Reader.cpp | 22 ++++++------
src/drivers/liblas/Writer.cpp | 32 +++++++++---------
test/unit/CMakeLists.txt | 2 +-
test/unit/ChipperTest.cpp | 5 ++-
test/unit/LiblasReaderTest.cpp | 6 +++-
test/unit/LiblasWriterTest.cpp | 12 ++++--
test/unit/main.cpp | 53 ++++++++++++++++++++++++++------
23 files changed, 135 insertions(+), 107 deletions(-)
diffs (truncated from 731 to 300 lines):
diff -r bc3f95912b0b -r 84734bb4ec31 apps/pc2pc.cpp
--- a/apps/pc2pc.cpp Wed Mar 16 14:49:38 2011 -0400
+++ b/apps/pc2pc.cpp Wed Mar 16 15:31:50 2011 -0400
@@ -107,11 +107,11 @@
if (hasOption("native"))
{
- LasReader reader(*ifs);
+ libpc::drivers::las::LasReader reader(*ifs);
const boost::uint64_t numPoints = reader.getHeader().getNumPoints();
- LasWriter writer(reader, *ofs);
+ libpc::drivers::las::LasWriter writer(reader, *ofs);
//BUG: handle laz writer.setCompressed(false);
@@ -158,11 +158,11 @@
#endif
else
{
- LiblasReader reader(*ifs);
+ libpc::drivers::liblas::LiblasReader reader(*ifs);
const boost::uint64_t numPoints = reader.getHeader().getNumPoints();
- LiblasWriter writer(reader, *ofs);
+ libpc::drivers::liblas::LiblasWriter writer(reader, *ofs);
//BUG: handle laz writer.setCompressed(false);
diff -r bc3f95912b0b -r 84734bb4ec31 apps/pcinfo.cpp
--- a/apps/pcinfo.cpp Wed Mar 16 14:49:38 2011 -0400
+++ b/apps/pcinfo.cpp Wed Mar 16 15:31:50 2011 -0400
@@ -81,11 +81,11 @@
libpc::Reader* reader = NULL;
if (hasOption("native"))
{
- reader = new LasReader(*ifs);
+ reader = new libpc::drivers::las::LasReader(*ifs);
}
else
{
- reader = new LiblasReader(*ifs);
+ reader = new libpc::drivers::liblas::LiblasReader(*ifs);
}
boost::uint64_t numPoints = reader->getNumPoints();
diff -r bc3f95912b0b -r 84734bb4ec31 include/libpc/drivers/las/Header.hpp
--- a/include/libpc/drivers/las/Header.hpp Wed Mar 16 14:49:38 2011 -0400
+++ b/include/libpc/drivers/las/Header.hpp Wed Mar 16 15:31:50 2011 -0400
@@ -51,8 +51,8 @@
#include <libpc/Header.hpp>
-namespace libpc
-{
+namespace libpc { namespace drivers { namespace las {
+
class LIBPC_DLL LasHeader : public Header
{
@@ -409,6 +409,6 @@
LIBPC_DLL std::ostream& operator<<(std::ostream& ostr, const LasHeader&);
-} // namespace libpc
+} } } // namespace
#endif
diff -r bc3f95912b0b -r 84734bb4ec31 include/libpc/drivers/las/Reader.hpp
--- a/include/libpc/drivers/las/Reader.hpp Wed Mar 16 14:49:38 2011 -0400
+++ b/include/libpc/drivers/las/Reader.hpp Wed Mar 16 15:31:50 2011 -0400
@@ -40,8 +40,8 @@
#include <libpc/Reader.hpp>
#include <libpc/drivers/las/Header.hpp>
-namespace libpc
-{
+namespace libpc { namespace drivers { namespace las {
+
class LIBPC_DLL LasReader : public Reader
{
@@ -69,6 +69,6 @@
LasReader(const LasReader&); // not implemented
};
-} // namespace libpc
+} } } // namespaces
#endif
diff -r bc3f95912b0b -r 84734bb4ec31 include/libpc/drivers/las/Writer.hpp
--- a/include/libpc/drivers/las/Writer.hpp Wed Mar 16 14:49:38 2011 -0400
+++ b/include/libpc/drivers/las/Writer.hpp Wed Mar 16 15:31:50 2011 -0400
@@ -38,8 +38,8 @@
#include <libpc/Writer.hpp>
#include <libpc/drivers/las/Header.hpp>
-namespace libpc
-{
+namespace libpc { namespace drivers { namespace las {
+
class LIBPC_DLL LasWriter : public Writer
{
@@ -66,6 +66,6 @@
LasWriter(const LasWriter&); // not implemented
};
-} // namespace libpc
+} } } // namespaces
#endif
diff -r bc3f95912b0b -r 84734bb4ec31 include/libpc/drivers/liblas/Header.hpp
--- a/include/libpc/drivers/liblas/Header.hpp Wed Mar 16 14:49:38 2011 -0400
+++ b/include/libpc/drivers/liblas/Header.hpp Wed Mar 16 15:31:50 2011 -0400
@@ -43,8 +43,8 @@
#include "libpc/Header.hpp"
-namespace libpc
-{
+namespace libpc { namespace drivers { namespace liblas {
+
class LIBPC_DLL LiblasHeader : public Header
{
@@ -58,6 +58,6 @@
LIBPC_DLL std::ostream& operator<<(std::ostream& ostr, const LiblasHeader&);
-} // namespace libpc
+} } } // namespaces
#endif
diff -r bc3f95912b0b -r 84734bb4ec31 include/libpc/drivers/liblas/Reader.hpp
--- a/include/libpc/drivers/liblas/Reader.hpp Wed Mar 16 14:49:38 2011 -0400
+++ b/include/libpc/drivers/liblas/Reader.hpp Wed Mar 16 15:31:50 2011 -0400
@@ -47,9 +47,8 @@
class Reader;
}
+namespace libpc { namespace drivers { namespace liblas {
-namespace libpc
-{
class LIBPC_DLL LiblasReader : public Reader
{
@@ -75,7 +74,7 @@
std::istream& m_istream;
- liblas::Reader *m_externalReader;
+ ::liblas::Reader *m_externalReader;
// LAS header properties of interest to us
boost::uint8_t m_versionMajor;
@@ -97,6 +96,6 @@
LiblasReader(const LiblasReader&); // not implemented
};
-} // namespace libpc
+} } } // namespaces
#endif
diff -r bc3f95912b0b -r 84734bb4ec31 include/libpc/drivers/liblas/Writer.hpp
--- a/include/libpc/drivers/liblas/Writer.hpp Wed Mar 16 14:49:38 2011 -0400
+++ b/include/libpc/drivers/liblas/Writer.hpp Wed Mar 16 15:31:50 2011 -0400
@@ -44,8 +44,7 @@
}
-namespace libpc
-{
+namespace libpc { namespace drivers { namespace liblas {
// we default to LAS 1.2, point format 0
class LIBPC_DLL LiblasWriter : public Writer
@@ -83,13 +82,13 @@
void setupExternalHeader();
std::ostream& m_ostream;
- liblas::Writer* m_externalWriter;
- liblas::Header* m_externalHeader;
+ ::liblas::Writer* m_externalWriter;
+ ::liblas::Header* m_externalHeader;
LiblasWriter& operator=(const LiblasWriter&); // not implemented
LiblasWriter(const LiblasWriter&); // not implemented
};
-} // namespace libpc
+} } } // namespaces
#endif
diff -r bc3f95912b0b -r 84734bb4ec31 src/drivers/las/Header.cpp
--- a/src/drivers/las/Header.cpp Wed Mar 16 14:49:38 2011 -0400
+++ b/src/drivers/las/Header.cpp Wed Mar 16 15:31:50 2011 -0400
@@ -45,8 +45,8 @@
#include <boost/concept_check.hpp>
#include <boost/uuid/uuid_io.hpp>
-namespace libpc
-{
+namespace libpc { namespace drivers { namespace las {
+
// BUG: should be std::string
char const* const LasHeader::FileSignature = "LASF";
@@ -923,7 +923,4 @@
-
-
-
-} // namespace libpc
+} } } // namespaces
diff -r bc3f95912b0b -r 84734bb4ec31 src/drivers/las/LasHeaderReader.cpp
--- a/src/drivers/las/LasHeaderReader.cpp Wed Mar 16 14:49:38 2011 -0400
+++ b/src/drivers/las/LasHeaderReader.cpp Wed Mar 16 15:31:50 2011 -0400
@@ -45,8 +45,7 @@
#include <boost/concept_check.hpp>
#include <boost/uuid/uuid_io.hpp>
-namespace libpc
-{
+namespace libpc { namespace drivers { namespace las {
LasHeaderReader::LasHeaderReader(LasHeader& header, std::istream& istream)
@@ -451,4 +450,4 @@
-} // namespace libpc
+} } } // namespaces
diff -r bc3f95912b0b -r 84734bb4ec31 src/drivers/las/LasHeaderReader.hpp
--- a/src/drivers/las/LasHeaderReader.hpp Wed Mar 16 14:49:38 2011 -0400
+++ b/src/drivers/las/LasHeaderReader.hpp Wed Mar 16 15:31:50 2011 -0400
@@ -48,8 +48,8 @@
#include <libpc/drivers/las/Header.hpp>
-namespace libpc
-{
+namespace libpc { namespace drivers { namespace las {
+
class LIBPC_DLL LasHeaderReader
{
@@ -71,6 +71,6 @@
};
-} // namespace libpc
+} } } // namespaces
#endif
diff -r bc3f95912b0b -r 84734bb4ec31 src/drivers/las/LasHeaderWriter.cpp
--- a/src/drivers/las/LasHeaderWriter.cpp Wed Mar 16 14:49:38 2011 -0400
+++ b/src/drivers/las/LasHeaderWriter.cpp Wed Mar 16 15:31:50 2011 -0400
@@ -42,9 +42,8 @@
#include "LasHeaderWriter.hpp"
-namespace libpc
-{
-
+namespace libpc { namespace drivers { namespace las {
+
LasHeaderWriter::LasHeaderWriter(LasHeader& header, std::ostream& ostream)
: m_header(header)
@@ -393,6 +392,4 @@
}
-
-
-} // namespace libpc
+} } } // namespaces
diff -r bc3f95912b0b -r 84734bb4ec31 src/drivers/las/LasHeaderWriter.hpp
--- a/src/drivers/las/LasHeaderWriter.hpp Wed Mar 16 14:49:38 2011 -0400
+++ b/src/drivers/las/LasHeaderWriter.hpp Wed Mar 16 15:31:50 2011 -0400
@@ -47,8 +47,8 @@
#include "libpc/drivers/las/Header.hpp"
-namespace libpc
-{
+namespace libpc { namespace drivers { namespace las {
+
class LIBPC_DLL LasHeaderWriter
{
@@ -69,6 +69,6 @@
};
More information about the Liblas-commits
mailing list