This is more reliable

5 files changed, 23 insertions, 38 deletions

diff --git a/src/char/char.hpp b/src/char/char.hpp
index ffd6f06..a9c786f 100644
--- a/src/char/char.hpp
+++ b/src/char/char.hpp
@@ -1,5 +1,4 @@
-#ifndef TMWA_CHAR_CHAR_HPP
-#define TMWA_CHAR_CHAR_HPP
+#pragma once
 //    char.hpp - Character server.
 //
 //    Copyright © ????-2004 Athena Dev Teams
@@ -21,15 +20,15 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "fwd.hpp"
+#include "fwd.hpp"
 
-# include "../strings/fwd.hpp"
+#include "../strings/fwd.hpp"
 
-# include "../generic/array.hpp"
+#include "../generic/array.hpp"
 
-# include "../net/ip.hpp"
+#include "../net/ip.hpp"
 
-# include "../mmo/mmo.hpp"
+#include "../mmo/mmo.hpp"
 
 
 namespace tmwa
@@ -52,8 +51,6 @@ auto iter_map_sessions() -> decltype(filter_iterator<Session *>(std::declval<Arr
 
 void char_log(XString line);
 
-# define CHAR_LOG(fmt, ...) \
+#define CHAR_LOG(fmt, ...)  \
     char_log(STRPRINTF(fmt, ## __VA_ARGS__))
 } // namespace tmwa
-
-#endif // TMWA_CHAR_CHAR_HPP
diff --git a/src/char/fwd.hpp b/src/char/fwd.hpp
index 04097a6..31cd1ba 100644
--- a/src/char/fwd.hpp
+++ b/src/char/fwd.hpp
@@ -1,5 +1,4 @@
-#ifndef TMWA_CHAR_FWD_HPP
-#define TMWA_CHAR_FWD_HPP
+#pragma once
 //    char/fwd.hpp - list of type names for char server
 //
 //    Copyright © 2014 Ben Longbons <b.r.longbons@gmail.com>
@@ -19,12 +18,10 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "../sanity.hpp"
+#include "../sanity.hpp"
 
 
 namespace tmwa
 {
 // meh, add more when I feel like it
 } // namespace tmwa
-
-#endif // TMWA_CHAR_FWD_HPP
diff --git a/src/char/int_party.hpp b/src/char/int_party.hpp
index 88ce05f..f33fc0d 100644
--- a/src/char/int_party.hpp
+++ b/src/char/int_party.hpp
@@ -1,5 +1,4 @@
-#ifndef TMWA_CHAR_INT_PARTY_HPP
-#define TMWA_CHAR_INT_PARTY_HPP
+#pragma once
 //    int_party.hpp - Internal party handling.
 //
 //    Copyright © ????-2004 Athena Dev Teams
@@ -21,13 +20,13 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "fwd.hpp"
+#include "fwd.hpp"
 
-# include "../strings/fwd.hpp"
+#include "../strings/fwd.hpp"
 
-# include "../net/fwd.hpp"
+#include "../net/fwd.hpp"
 
-# include "../mmo/fwd.hpp"
+#include "../mmo/fwd.hpp"
 
 
 namespace tmwa
@@ -41,5 +40,3 @@ void inter_party_leave(PartyId party_id, AccountId account_id);
 
 extern AString party_txt;
 } // namespace tmwa
-
-#endif // TMWA_CHAR_INT_PARTY_HPP
diff --git a/src/char/int_storage.hpp b/src/char/int_storage.hpp
index e93be14..b8ec9db 100644
--- a/src/char/int_storage.hpp
+++ b/src/char/int_storage.hpp
@@ -1,5 +1,4 @@
-#ifndef TMWA_CHAR_INT_STORAGE_HPP
-#define TMWA_CHAR_INT_STORAGE_HPP
+#pragma once
 //    int_storage.hpp - Internal storage handling.
 //
 //    Copyright © ????-2004 Athena Dev Teams
@@ -21,13 +20,13 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "fwd.hpp"
+#include "fwd.hpp"
 
-# include "../strings/fwd.hpp"
+#include "../strings/fwd.hpp"
 
-# include "../net/fwd.hpp"
+#include "../net/fwd.hpp"
 
-# include "../mmo/fwd.hpp"
+#include "../mmo/fwd.hpp"
 
 
 namespace tmwa
@@ -41,5 +40,3 @@ RecvResult inter_storage_parse_frommap(Session *ms, uint16_t);
 
 extern AString storage_txt;
 } // namespace tmwa
-
-#endif // TMWA_CHAR_INT_STORAGE_HPP
diff --git a/src/char/inter.hpp b/src/char/inter.hpp
index ecfaf08..19900f9 100644
--- a/src/char/inter.hpp
+++ b/src/char/inter.hpp
@@ -1,5 +1,4 @@
-#ifndef TMWA_CHAR_INTER_HPP
-#define TMWA_CHAR_INTER_HPP
+#pragma once
 //    inter.hpp - Internal server.
 //
 //    Copyright © ????-2004 Athena Dev Teams
@@ -21,11 +20,11 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "fwd.hpp"
+#include "fwd.hpp"
 
-# include "../strings/fwd.hpp"
+#include "../strings/fwd.hpp"
 
-# include "../net/fwd.hpp"
+#include "../net/fwd.hpp"
 
 
 namespace tmwa
@@ -37,5 +36,3 @@ RecvResult inter_parse_frommap(Session *ms, uint16_t packet_id);
 
 extern int party_share_level;
 } // namespace tmwa
-
-#endif // TMWA_CHAR_INTER_HPP