From bb9486e0667a85eba3a39708f2cd9d6ceaa1b322 Mon Sep 17 00:00:00 2001
From: Oliver Giles <ohw.giles@gmail.com>
Date: Wed, 20 Dec 2017 08:24:25 +0200
Subject: [PATCH] use compliant include guards

---
 src/conf.h      | 6 +++---
 src/database.h  | 6 +++---
 src/interface.h | 6 +++---
 src/laminar.h   | 6 +++---
 src/log.h       | 6 +++---
 src/node.h      | 6 +++---
 src/resources.h | 6 +++---
 src/run.h       | 6 +++---
 src/server.h    | 6 +++---
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/conf.h b/src/conf.h
index 152a908..cdabf95 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_CONF_H_
-#define _LAMINAR_CONF_H_
+#ifndef LAMINAR_CONF_H_
+#define LAMINAR_CONF_H_
 
 #include <unordered_map>
 
@@ -41,4 +41,4 @@ int StringMap::convert(std::string e);
 StringMap parseConfFile(const char* path);
 
 
-#endif // _LAMINAR_CONF_H_
+#endif // LAMINAR_CONF_H_
diff --git a/src/database.h b/src/database.h
index c5b3224..00e9dd5 100644
--- a/src/database.h
+++ b/src/database.h
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_DATABASE_H_
-#define _LAMINAR_DATABASE_H_
+#ifndef LAMINAR_DATABASE_H_
+#define LAMINAR_DATABASE_H_
 
 #include <string>
 #include <functional>
@@ -142,4 +142,4 @@ template<> const char* Database::Statement::fetchColumn(int col);
 template<> int Database::Statement::fetchColumn(int col);
 template<> time_t Database::Statement::fetchColumn(int col);
 
-#endif // _LAMINAR_DATABASE_H_
+#endif // LAMINAR_DATABASE_H_
diff --git a/src/interface.h b/src/interface.h
index e430f6d..3fe79d6 100644
--- a/src/interface.h
+++ b/src/interface.h
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef INTERFACE_H
-#define INTERFACE_H
+#ifndef LAMINAR_INTERFACE_H_
+#define LAMINAR_INTERFACE_H_
 
 #include "run.h"
 
@@ -118,5 +118,5 @@ struct LaminarInterface {
     virtual bool getArtefact(std::string path, std::string& result) = 0;
 };
 
-#endif // INTERFACE_H
+#endif // LAMINAR_INTERFACE_H_
 
diff --git a/src/laminar.h b/src/laminar.h
index 4419d7a..8c0b9bc 100644
--- a/src/laminar.h
+++ b/src/laminar.h
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_LAMINAR_H_
-#define _LAMINAR_LAMINAR_H_
+#ifndef LAMINAR_LAMINAR_H_
+#define LAMINAR_LAMINAR_H_
 
 #include "interface.h"
 #include "run.h"
@@ -90,4 +90,4 @@ private:
     std::string archiveUrl;
 };
 
-#endif // _LAMINAR_LAMINAR_H_
+#endif // LAMINAR_LAMINAR_H_
diff --git a/src/log.h b/src/log.h
index 1632f62..8cc3a2c 100644
--- a/src/log.h
+++ b/src/log.h
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_LOG_H_
-#define _LAMINAR_LOG_H_
+#ifndef LAMINAR_LOG_H_
+#define LAMINAR_LOG_H_
 
 #include <kj/debug.h>
 
@@ -33,5 +33,5 @@
                         #__VA_ARGS__, __VA_ARGS__)
 
 
-#endif // _LAMINAR_LOG_H_
+#endif // LAMINAR_LOG_H_
 
diff --git a/src/node.h b/src/node.h
index e414ddc..342a39c 100644
--- a/src/node.h
+++ b/src/node.h
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_NODE_H_
-#define _LAMINAR_NODE_H_
+#ifndef LAMINAR_NODE_H_
+#define LAMINAR_NODE_H_
 
 #include <string>
 #include <set>
@@ -40,4 +40,4 @@ public:
 };
 
 
-#endif // _LAMINAR_NODE_H_
+#endif // LAMINAR_NODE_H_
diff --git a/src/resources.h b/src/resources.h
index 4eeaf05..969a228 100644
--- a/src/resources.h
+++ b/src/resources.h
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_RESOURCES_H_
-#define _LAMINAR_RESOURCES_H_
+#ifndef LAMINAR_RESOURCES_H_
+#define LAMINAR_RESOURCES_H_
 
 #include <unordered_map>
 #include <utility>
@@ -43,4 +43,4 @@ private:
     std::unordered_map<std::string, const Resource> resources;
 };
 
-#endif // _LAMINAR_RESOURCES_H_
+#endif // LAMINAR_RESOURCES_H_
diff --git a/src/run.h b/src/run.h
index 551744a..484548a 100644
--- a/src/run.h
+++ b/src/run.h
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_RUN_H_
-#define _LAMINAR_RUN_H_
+#ifndef LAMINAR_RUN_H_
+#define LAMINAR_RUN_H_
 
 #include <string>
 #include <queue>
@@ -150,4 +150,4 @@ struct RunSet: public boost::multi_index_container<
     // TODO: getters for each index
 };
 
-#endif // _LAMINAR_RUN_H_
+#endif // LAMINAR_RUN_H_
diff --git a/src/server.h b/src/server.h
index 63b4169..63a62a2 100644
--- a/src/server.h
+++ b/src/server.h
@@ -16,8 +16,8 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef _LAMINAR_SERVER_H_
-#define _LAMINAR_SERVER_H_
+#ifndef LAMINAR_SERVER_H_
+#define LAMINAR_SERVER_H_
 
 #include <kj/async-io.h>
 #include <capnp/message.h>
@@ -63,4 +63,4 @@ private:
     kj::TaskSet tasks;
 };
 
-#endif // _LAMINAR_SERVER_H_
+#endif // LAMINAR_SERVER_H_