From 74ef178b1e782e2a4f7c997a3ddd2905472efa8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20K=C4=99dzia?= <Pawel.Kedzia@pwr.wroc.pl>
Date: Thu, 29 Dec 2011 12:20:26 +0100
Subject: [PATCH] namespace Corpus2::whole

---
 libcorpus2_whole/document.cpp          | 4 +++-
 libcorpus2_whole/document.h            | 4 +++-
 libcorpus2_whole/io/documentreader.cpp | 6 ++++--
 libcorpus2_whole/io/documentreader.h   | 5 ++++-
 libcorpus2_whole/io/relreader.cpp      | 5 ++++-
 libcorpus2_whole/io/relreader.h        | 6 +++++-
 libcorpus2_whole/relation.cpp          | 4 +++-
 libcorpus2_whole/relation.h            | 4 +++-
 8 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/libcorpus2_whole/document.cpp b/libcorpus2_whole/document.cpp
index 889fbf2..6b949b3 100644
--- a/libcorpus2_whole/document.cpp
+++ b/libcorpus2_whole/document.cpp
@@ -18,6 +18,7 @@ or FITNESS FOR A PARTICULAR PURPOSE.
 #include <boost/make_shared.hpp>
 
 namespace Corpus2 {
+namespace whole {
 
 Document::Document()
 	: paragraphs_(), relations_()
@@ -28,4 +29,5 @@ Document::~Document()
 {
 }
 
-} /* end ns Corpus2 */
+} // whole ns
+} // Corpus2 ns
diff --git a/libcorpus2_whole/document.h b/libcorpus2_whole/document.h
index 0401386..97ad4b8 100644
--- a/libcorpus2_whole/document.h
+++ b/libcorpus2_whole/document.h
@@ -22,6 +22,7 @@ or FITNESS FOR A PARTICULAR PURPOSE.
 #include <boost/shared_ptr.hpp>
 
 namespace Corpus2 {
+namespace whole {
 
 /**
  * A whole document, consisting of consecutive paragraphs ("chunks"), being
@@ -63,6 +64,7 @@ protected:
 	std::vector< boost::shared_ptr<Relation> > relations_;
 };
 
-} /* end ns Corpus2 */
+} // whole ns
+} // Corpus2 ns
 
 #endif // LIBCORPUS2_WHOLE_DOCUMENT_H
diff --git a/libcorpus2_whole/io/documentreader.cpp b/libcorpus2_whole/io/documentreader.cpp
index 4fba578..4d35ffe 100644
--- a/libcorpus2_whole/io/documentreader.cpp
+++ b/libcorpus2_whole/io/documentreader.cpp
@@ -15,9 +15,10 @@ or FITNESS FOR A PARTICULAR PURPOSE.
 */
 
 #include <boost/make_shared.hpp>
-#include <libcorpus2_whole/io/docreader.h>
+#include <libcorpus2_whole/io/documentreader.h>
 
 namespace Corpus2 {
+namespace whole {
 	DocumentReader::DocumentReader(const Tagset& tagset,
 		const std::string &annot_path, const std::string &rela_path)
 			: DocumentReaderI("document")
@@ -77,4 +78,5 @@ namespace Corpus2 {
 		return "";
 	}
 
-} /* end ns Corpus2 */
+} // whole ns
+} // Corpus2 ns
diff --git a/libcorpus2_whole/io/documentreader.h b/libcorpus2_whole/io/documentreader.h
index acbb595..0373c34 100644
--- a/libcorpus2_whole/io/documentreader.h
+++ b/libcorpus2_whole/io/documentreader.h
@@ -26,6 +26,7 @@ or FITNESS FOR A PARTICULAR PURPOSE.
 #include <boost/shared_ptr.hpp>
 
 namespace Corpus2 {
+namespace whole {
 
 /**
  * A reader for whole documents. Note that a whole document is read into memory
@@ -84,6 +85,8 @@ private:
 	/// Pointer to RelationReader
 	boost::shared_ptr<RelationReader> rel_reader_;
 };
-} /* end ns Corpus2 */
+
+} // whole ns
+} // Corpus2 ns
 
 #endif // LIBCORPUS2_WHOLE_DOCREADER_H
diff --git a/libcorpus2_whole/io/relreader.cpp b/libcorpus2_whole/io/relreader.cpp
index f683046..c94ac6e 100644
--- a/libcorpus2_whole/io/relreader.cpp
+++ b/libcorpus2_whole/io/relreader.cpp
@@ -22,6 +22,8 @@ or FITNESS FOR A PARTICULAR PURPOSE.
 #include <boost/make_shared.hpp>
 
 namespace Corpus2 {
+namespace whole {
+
 RelationReader::RelationReader(const std::string &rela_path)
 	: rela_path_(rela_path)
 {
@@ -197,4 +199,5 @@ std::string RelationReader::get_attribute_value(
 	return "";
 }
 
-} /* end ns Corpus2 */
+} // whole ns
+} // Corpus2 ns
diff --git a/libcorpus2_whole/io/relreader.h b/libcorpus2_whole/io/relreader.h
index 225c0b4..bb01e19 100644
--- a/libcorpus2_whole/io/relreader.h
+++ b/libcorpus2_whole/io/relreader.h
@@ -27,6 +27,8 @@ or FITNESS FOR A PARTICULAR PURPOSE.
 #include <iostream>
 
 namespace Corpus2 {
+namespace whole {
+
 	const static std::string RELATION_TAG = "rel";
 	const static std::string RELATIONS_TAG = "relations";
 	const static std::string RELATION_DIRECT_FROM = "from";
@@ -118,6 +120,8 @@ private:
 	boost::shared_ptr<DirectionPoint> rel_from_;
 	boost::shared_ptr<DirectionPoint> rel_to_;
 };
-} /* end ns Corpus2 */
+
+} // whole ns
+} // Corpus2 ns
 
 #endif // LIBCORPUS2_WHOLE_RELREADER_H
diff --git a/libcorpus2_whole/relation.cpp b/libcorpus2_whole/relation.cpp
index 163a1a6..d1df54f 100644
--- a/libcorpus2_whole/relation.cpp
+++ b/libcorpus2_whole/relation.cpp
@@ -18,6 +18,7 @@ or FITNESS FOR A PARTICULAR PURPOSE.
 #include <libcorpus2_whole/relation.h>
 
 namespace Corpus2 {
+namespace whole {
 
 Relation::Relation(const std::string& name,
 				   const boost::shared_ptr<const DirectionPoint> from,
@@ -39,4 +40,5 @@ Relation::~Relation()
 {
 }
 
-} /* end ns Corpus2 */
+} // whole ns
+} // Corpus2 ns
diff --git a/libcorpus2_whole/relation.h b/libcorpus2_whole/relation.h
index aea3680..8e8ed1d 100644
--- a/libcorpus2_whole/relation.h
+++ b/libcorpus2_whole/relation.h
@@ -21,6 +21,7 @@ or FITNESS FOR A PARTICULAR PURPOSE.
 #include <boost/shared_ptr.hpp>
 
 namespace Corpus2 {
+namespace whole {
 
 /**
  * Helper class to represent one of two point of direction in any relation.
@@ -117,6 +118,7 @@ private:
 	const boost::shared_ptr<const DirectionPoint> to_;
 };
 
-} /* end ns Corpus2 */
+} // whole ns
+} // Corpus2 ns
 
 #endif // LIBCORPUS2_RELATIONT_H
-- 
GitLab