Merge pull request #384 from OutpostUniverse/GlobalNamespaceTry2

Global namespace try2

src/Archive/AdaptiveHuffmanTree.cpp

@@ -3,7 +3,7 @@
 #include <string>
 #include <stdexcept>
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	// Creates an (adaptive) Huffman tree with terminalNodeCount at the bottom.
 	AdaptiveHuffmanTree::AdaptiveHuffmanTree(NodeType terminalNodeCount) :

src/Archive/AdaptiveHuffmanTree.h

@@ -1,6 +1,6 @@
 #include <vector>
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	// The Huffman Tree stores codes in the terminal nodes of the (binary) tree.
 	// The tree is initially balanced with codes 0 to terminalNodeCount-1 in the

src/Archive/ArchiveFile.cpp

@@ -7,7 +7,7 @@
 #include <string>
 #include <stdexcept>
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	ArchiveFile::ArchiveFile(const std::string& filename) :
 		m_ArchiveFilename(filename), m_Count(0), m_ArchiveFileSize(0) { }

src/Archive/ArchiveFile.h

@@ -6,7 +6,7 @@
 #include <cstdint>
 #include <cstddef>
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	class ArchiveFile
 	{

src/Archive/BitStreamReader.cpp

@@ -3,7 +3,7 @@
 #include <string>
 #include <limits>
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	BitStreamReader::BitStreamReader(void *buffer, std::size_t bufferSize) :
 		m_BufferBitSize(bufferSize << 3),

src/Archive/BitStreamReader.h

@@ -2,7 +2,7 @@
 
 #include <cstddef>
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	// This is designed for use in the .vol file decompressor
 	class BitStreamReader

src/Archive/ClmFile.cpp

@@ -4,7 +4,7 @@
 #include <stdexcept>
 #include <algorithm>
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	ClmFile::ClmFile(const std::string& filename) : ArchiveFile(filename), clmFileReader(filename)
 	{

src/Archive/ClmFile.h

@@ -11,7 +11,7 @@
 #include <array>
 #include <memory>
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	class ClmFile : public ArchiveFile
 	{

src/Archive/CompressionType.h

@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	// Represents compression flags used by Outpost 2 .VOL files to compress files
 	// See FileFormat Archive Vol.txt for more details

src/Archive/HuffLZ.cpp

@@ -1,7 +1,7 @@
 #include "HuffLZ.h"
 #include <cstring>
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	// Constructs the object around an existing bit stream
 	HuffLZ::HuffLZ(const BitStreamReader& bitStream) :

src/Archive/HuffLZ.h

@@ -5,7 +5,7 @@
 #include "BitStreamReader.h"
 #include <cstddef>
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	class HuffLZ
 	{

src/Archive/VolFile.cpp

@@ -6,7 +6,7 @@
 #include <climits>
 #include <typeinfo>
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	// Volume section header tags
 	constexpr auto TagVOL_ = MakeTag("VOL "); // Volume file tag

src/Archive/VolFile.h

@@ -12,7 +12,7 @@
 #include <array>
 #include <memory>
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	class VolFile : public ArchiveFile
 	{

src/Archive/WaveFile.cpp

@@ -1,6 +1,6 @@
 #include "WaveFile.h"
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	WaveHeader WaveHeader::Create(const WaveFormatEx& waveFormat, uint32_t dataLength)
 	{

src/Archive/WaveFile.h

@@ -4,7 +4,7 @@
 #include <array>
 #include <cstdint>
 
-namespace Archive
+namespace OP2Utility::Archive
 {
 	constexpr auto tagRIFF = MakeTag("RIFF");
 	constexpr auto tagWAVE = MakeTag("WAVE");

src/BitTwiddle.cpp

@@ -1,18 +1,20 @@
 #include "BitTwiddle.h"
 
-
-bool IsPowerOf2(uint32_t value)
+namespace OP2Utility
 {
-	return value && !(value & (value - 1));
-}
+	bool IsPowerOf2(uint32_t value)
+	{
+		return value && !(value & (value - 1));
+	}
 
-// This method assumes the argument is a power of 2
-uint32_t Log2OfPowerOf2(uint32_t value)
-{
-	static const int MultiplyDeBruijnBitPosition2[32] =
+	// This method assumes the argument is a power of 2
+	uint32_t Log2OfPowerOf2(uint32_t value)
 	{
-		0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
-		31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
-	};
-	return MultiplyDeBruijnBitPosition2[static_cast<uint32_t>(value * 0x077CB531U) >> 27];
+		static const int MultiplyDeBruijnBitPosition2[32] =
+		{
+			0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
+			31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
+		};
+		return MultiplyDeBruijnBitPosition2[static_cast<uint32_t>(value * 0x077CB531U) >> 27];
+	}
 }

src/BitTwiddle.h

@@ -3,5 +3,8 @@
 
 #include <cstdint>
 
-bool IsPowerOf2(uint32_t value);
-uint32_t Log2OfPowerOf2(uint32_t value);
+namespace OP2Utility
+{
+	bool IsPowerOf2(uint32_t value);
+	uint32_t Log2OfPowerOf2(uint32_t value);
+}