5 files changed, 27 insertions, 20 deletions
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index 7a682105f..bea84f005 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -250,8 +250,8 @@ void GuildHandler::leave(const int guildId) const
     msg.writeString("", 40);                  // Message
 }
 
-void GuildHandler::kick(const GuildMember *const member,
-                        const std::string &reason) const
+void GuildHandler::kick(const GuildMember *restrict const member,
+                        const std::string &restrict reason) const
 {
     if (!member || !member->getGuild())
         return;
@@ -314,8 +314,9 @@ void GuildHandler::changeMemberPostion(const GuildMember *const member,
     msg.writeInt32(level);                // pos
 }
 
-void GuildHandler::changeNotice(const int guildId, const std::string &msg1,
-                                const std::string &msg2) const
+void GuildHandler::changeNotice(const int guildId,
+                                const std::string &restrict msg1,
+                                const std::string &restrict msg2) const
 {
     MessageOut msg(CMSG_GUILD_CHANGE_NOTICE);
     msg.writeInt32(guildId);
diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h
index f8ee35fd6..5ecfb122b 100644
--- a/src/net/eathena/guildhandler.h
+++ b/src/net/eathena/guildhandler.h
@@ -53,8 +53,8 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
 
         void leave(const int guildId) const override final;
 
-        void kick(const GuildMember *const member,
-                  const std::string &reason) const override final;
+        void kick(const GuildMember *restrict const member,
+                  const std::string &restrict reason) const override final;
 
         void chat(const int guildId,
                   const std::string &text) const override final;
@@ -66,8 +66,10 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
         void changeMemberPostion(const GuildMember *const member,
                                  const int level) const override final;
 
-        void changeNotice(const int guildId, const std::string &msg1,
-                          const std::string &msg2) const override final;
+        void changeNotice(const int guildId,
+                          const std::string &restrict msg1,
+                          const std::string &restrict msg2)
+                          const override final;
 };
 
     extern Ea::GuildTab *guildTab;
diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h
index 3a825c550..184f928f6 100644
--- a/src/net/guildhandler.h
+++ b/src/net/guildhandler.h
@@ -53,8 +53,8 @@ class GuildHandler
 
         virtual void leave(const int guildId) const = 0;
 
-        virtual void kick(const GuildMember *const member,
-                          const std::string &reason) const = 0;
+        virtual void kick(const GuildMember *restrict const member,
+                          const std::string &restrict reason) const = 0;
 
         virtual void chat(const int guildId,
                           const std::string &text) const = 0;
@@ -76,8 +76,9 @@ class GuildHandler
         virtual void endAlliance(const int guildId,
                                  const int otherGuildId) const = 0;
 
-        virtual void changeNotice(const int guildId, const std::string &msg1,
-                                  const std::string &msg2) const = 0;
+        virtual void changeNotice(const int guildId,
+                                  const std::string &restrict msg1,
+                                  const std::string &restrict msg2) const = 0;
 
         virtual void clear() const = 0;
 
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 60747685d..299668cc1 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -255,8 +255,8 @@ void GuildHandler::leave(const int guildId) const
     msg.writeString("", 40);                  // Message
 }
 
-void GuildHandler::kick(const GuildMember *const member,
-                        const std::string &reason) const
+void GuildHandler::kick(const GuildMember *restrict const member,
+                        const std::string &restrict reason) const
 {
     if (!member || !member->getGuild())
         return;
@@ -319,8 +319,9 @@ void GuildHandler::changeMemberPostion(const GuildMember *const member,
     msg.writeInt32(level);                // pos
 }
 
-void GuildHandler::changeNotice(const int guildId, const std::string &msg1,
-                                const std::string &msg2) const
+void GuildHandler::changeNotice(const int guildId,
+                                const std::string &restrict msg1,
+                                const std::string &restrict msg2) const
 {
     MessageOut msg(CMSG_GUILD_CHANGE_NOTICE);
     msg.writeInt32(guildId);
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index ea4c0f182..04a8999e4 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -53,8 +53,8 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
 
         void leave(const int guildId) const override final;
 
-        void kick(const GuildMember *const member,
-                  const std::string &reason) const override final;
+        void kick(const GuildMember *restrict const member,
+                  const std::string &restrict reason) const override final;
 
         void chat(const int guildId,
                   const std::string &text) const override final;
@@ -66,8 +66,10 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
         void changeMemberPostion(const GuildMember *const member,
                                  const int level) const override final;
 
-        void changeNotice(const int guildId, const std::string &msg1,
-                          const std::string &msg2) const override final;
+        void changeNotice(const int guildId,
+                          const std::string &restrict msg1,
+                          const std::string &restrict msg2)
+                          const override final;
 };
 
     extern Ea::GuildTab *guildTab;