Unify (and fix) include guards

assert/AssertFailed.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_ASSERT_ASSERTFAILED_H
-#define MESSMER_CPP_UTILS_ASSERT_ASSERTFAILED_H
+#ifndef MESSMER_CPPUTILS_ASSERT_ASSERTFAILED_H
+#define MESSMER_CPPUTILS_ASSERT_ASSERTFAILED_H
 
 #include <stdexcept>
 #include <string>

assert/assert.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_ASSERT_ASSERT_H
-#define MESSMER_CPP_UTILS_ASSERT_ASSERT_H
+#ifndef MESSMER_CPPUTILS_ASSERT_ASSERT_H
+#define MESSMER_CPPUTILS_ASSERT_ASSERT_H
 
 /**
  * This implements an ASSERT(expr, msg) macro.

assert/backtrace.h

@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_CPPUTILS_ASSERT_BACKTRACE_H
 #define MESSMER_CPPUTILS_ASSERT_BACKTRACE_H
 

daemon/daemonize.h

@@ -1,5 +1,6 @@
-#ifndef CPPUTILS_DAEMON_DAEMONIZE_H
-#define CPPUTILS_DAEMON_DAEMONIZE_H
+#pragma once
+#ifndef MESSMER_CPPUTILS_DAEMON_DAEMONIZE_H
+#define MESSMER_CPPUTILS_DAEMON_DAEMONIZE_H
 
 namespace cpputils {
     void daemonize();

data/DataFixture.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_DATA_DATAFIXTURE_H_
-#define MESSMER_CPP_UTILS_DATA_DATAFIXTURE_H_
+#ifndef MESSMER_CPPUTILS_DATA_DATAFIXTURE_H_
+#define MESSMER_CPPUTILS_DATA_DATAFIXTURE_H_
 
 #include "Data.h"
 

either.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_EITHER_H
-#define MESSMER_CPP_UTILS_EITHER_H
+#ifndef MESSMER_CPPUTILS_EITHER_H
+#define MESSMER_CPPUTILS_EITHER_H
 
 #include <boost/optional.hpp>
 

io/pipestream.h

@@ -22,7 +22,7 @@
 //  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 //  OTHER DEALINGS IN THE SOFTWARE.
 // ----------------------------------------------------------------------------
-
+#pragma once
 #ifndef MESSMER_CPPUTILS_PIPESTREAM_H
 #define MESSMER_CPPUTILS_PIPESTREAM_H
 

lock/ConditionBarrier.h

@@ -1,5 +1,6 @@
-#ifndef MESSMER_CPPUTILS_CONDITIONBARRIER_H
-#define MESSMER_CPPUTILS__CONDITIONBARRIER_H
+#pragma once
+#ifndef MESSMER_CPPUTILS_LOCK_CONDITIONBARRIER_H
+#define MESSMER_CPPUTILS_LOCK_CONDITIONBARRIER_H
 
 #include <mutex>
 #include <condition_variable>

lock/LockPool.h

@@ -1,5 +1,6 @@
-#ifndef MESSMER_CPPUTILS_LOCKPOOL_H
-#define MESSMER_CPPUTILS_LOCKPOOL_H
+#pragma once
+#ifndef MESSMER_CPPUTILS_LOCK_LOCKPOOL_H
+#define MESSMER_CPPUTILS_LOCK_LOCKPOOL_H
 
 #include <mutex>
 #include <condition_variable>

lock/MutexPoolLock.h

@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_CPPUTILS_LOCK_MUTEXPOOLLOCK_H
 #define MESSMER_CPPUTILS_LOCK_MUTEXPOOLLOCK_H
 

macros.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_MACROS_H_
-#define MESSMER_CPP_UTILS_MACROS_H_
+#ifndef MESSMER_CPPUTILS_MACROS_H_
+#define MESSMER_CPPUTILS_MACROS_H_
 
 /**
  * Disallow the copy and assignment constructors of a class

pointer/cast.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_POINTER_CAST_H_
-#define MESSMER_CPP_UTILS_POINTER_CAST_H_
+#ifndef MESSMER_CPPUTILS_POINTER_CAST_H_
+#define MESSMER_CPPUTILS_POINTER_CAST_H_
 
 #include <memory>
 

pointer/optional_ownership_ptr.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_POINTER_OPTIONALOWNERSHIPPOINTER_H_
-#define MESSMER_CPP_UTILS_POINTER_OPTIONALOWNERSHIPPOINTER_H_
+#ifndef MESSMER_CPPUTILS_POINTER_OPTIONALOWNERSHIPPOINTER_H_
+#define MESSMER_CPPUTILS_POINTER_OPTIONALOWNERSHIPPOINTER_H_
 
 #include "unique_ref.h"
 #include <functional>

pointer/unique_ref.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_POINTER_UNIQUE_REF_H
-#define MESSMER_CPP_UTILS_POINTER_UNIQUE_REF_H
+#ifndef MESSMER_CPPUTILS_POINTER_UNIQUE_REF_H
+#define MESSMER_CPPUTILS_POINTER_UNIQUE_REF_H
 
 #include <memory>
 #include <boost/optional.hpp>

pointer/unique_ref_boost_optional_gtest_workaround.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_CPP_UTILS_POINTER_UNIQUE_REF_BOOST_OPTIONAL_GTEST_WORKAROUND_H
-#define MESSMER_CPP_UTILS_POINTER_UNIQUE_REF_BOOST_OPTIONAL_GTEST_WORKAROUND_H
+#ifndef MESSMER_CPPUTILS_POINTER_UNIQUE_REF_BOOST_OPTIONAL_GTEST_WORKAROUND_H
+#define MESSMER_CPPUTILS_POINTER_UNIQUE_REF_BOOST_OPTIONAL_GTEST_WORKAROUND_H
 
 /**
  * This is a workaround for using boost::optional<unique_ref<T>> in gtest.

tempfile/TempDir.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_TEMPFILE_TEMPDIR_H_
-#define MESSMER_TEMPFILE_TEMPDIR_H_
+#ifndef MESSMER_CPPUTILS_TEMPFILE_TEMPDIR_H_
+#define MESSMER_CPPUTILS_TEMPFILE_TEMPDIR_H_
 
 #include <boost/filesystem.hpp>
 #include "../macros.h"

tempfile/TempFile.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef MESSMER_TEMPFILE_TEMPFILE_H_
-#define MESSMER_TEMPFILE_TEMPFILE_H_
+#ifndef MESSMER_CPPUTILS_TEMPFILE_TEMPFILE_H_
+#define MESSMER_CPPUTILS_TEMPFILE_TEMPFILE_H_
 
 #include <boost/filesystem.hpp>
 #include "../macros.h"

test/io/ConsoleTest.h

@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_CPPUTILS_TEST_IO_CONSOLETEST_H
 #define MESSMER_CPPUTILS_TEST_IO_CONSOLETEST_H