diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-09-05 15:13:34 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-09-05 15:13:34 +0300 |
commit | c2816a9cad9d94d1734d64ab89237c925fa57620 (patch) | |
tree | 7a8005c0ab955ec938bafc89e4158b1457c467d3 /src/net | |
parent | 53606350048c2145b104cfc09af838db387bdce2 (diff) | |
download | plus-c2816a9cad9d94d1734d64ab89237c925fa57620.tar.gz plus-c2816a9cad9d94d1734d64ab89237c925fa57620.tar.bz2 plus-c2816a9cad9d94d1734d64ab89237c925fa57620.tar.xz plus-c2816a9cad9d94d1734d64ab89237c925fa57620.zip |
Fix compilation warnings.
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/character.h | 2 | ||||
-rw-r--r-- | src/net/characters.h | 37 | ||||
-rw-r--r-- | src/net/charserverhandler.h | 4 | ||||
-rw-r--r-- | src/net/chathandler.h | 2 |
4 files changed, 43 insertions, 2 deletions
diff --git a/src/net/character.h b/src/net/character.h index 4e30d18eb..9a014c312 100644 --- a/src/net/character.h +++ b/src/net/character.h @@ -57,6 +57,8 @@ struct Character final uint16_t slot; /**< The index in the list of characters */ }; +typedef std::list<Character*> Characters; + } // namespace Net #endif // NET_CHARACTER_H diff --git a/src/net/characters.h b/src/net/characters.h new file mode 100644 index 000000000..f9c4802b4 --- /dev/null +++ b/src/net/characters.h @@ -0,0 +1,37 @@ +/* + * The ManaPlus Client + * Copyright (C) 2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef NET_CHARACTERS_H +#define NET_CHARACTERS_H + +#include <list> + +#include "localconsts.h" + +namespace Net +{ + class Character; + + typedef std::list<Character*> Characters; +} // namespace Net + +#endif // NET_CHARACTERS_H diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h index 6d0c58d7f..7a6a78a7c 100644 --- a/src/net/charserverhandler.h +++ b/src/net/charserverhandler.h @@ -25,6 +25,8 @@ #include "being/localplayer.h" +#include "net/characters.h" + class CharCreateDialog; class CharSelectDialog; @@ -33,8 +35,6 @@ namespace Net struct Character; -typedef std::list<Character*> Characters; - class CharServerHandler notfinal { public: diff --git a/src/net/chathandler.h b/src/net/chathandler.h index f8659a8b2..630946498 100644 --- a/src/net/chathandler.h +++ b/src/net/chathandler.h @@ -23,6 +23,7 @@ #ifndef NET_CHATHANDLER_H #define NET_CHATHANDLER_H +#include <list> #include <string> #include "localconsts.h" @@ -31,6 +32,7 @@ struct ChatObject; namespace Net { + class ChatHandler notfinal { public: |