From 24149e9e343dd5e507d2b4e879df55c692fbf9d1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 7 Jun 2017 21:47:14 +0300 Subject: Remove static in anonimouse namespaces. --- src/being/playerrelations.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'src/being') diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp index 2e4b4b68c..e45376137 100644 --- a/src/being/playerrelations.cpp +++ b/src/being/playerrelations.cpp @@ -44,18 +44,18 @@ typedef PlayerRelations::const_iterator PlayerRelationsCIter; typedef std::list PlayerRelationListeners; typedef PlayerRelationListeners::const_iterator PlayerRelationListenersCIter; -namespace -{ - static const char *const PLAYER_IGNORE_STRATEGY_NOP = "nop"; - static const char *const PLAYER_IGNORE_STRATEGY_EMOTE0 = "emote0"; - static const char *const DEFAULT_IGNORE_STRATEGY - = PLAYER_IGNORE_STRATEGY_EMOTE0; +static const char *const PLAYER_IGNORE_STRATEGY_NOP = "nop"; +static const char *const PLAYER_IGNORE_STRATEGY_EMOTE0 = "emote0"; +static const char *const DEFAULT_IGNORE_STRATEGY = + PLAYER_IGNORE_STRATEGY_EMOTE0; - static const char *const NAME = "name"; - static const char *const RELATION = "relation"; +static const char *const NAME = "name"; +static const char *const RELATION = "relation"; - static const unsigned int IGNORE_EMOTE_TIME = 100; +static const unsigned int IGNORE_EMOTE_TIME = 100; +namespace +{ class SortPlayersFunctor final { public: @@ -131,11 +131,10 @@ namespace return container; } }; - - static PlayerConfSerialiser player_conf_serialiser; // stateless singleton - } // namespace +static PlayerConfSerialiser player_conf_serialiser; // stateless singleton + const unsigned int PlayerRelation::RELATION_PERMISSIONS[RELATIONS_NR] = { /* NEUTRAL */ 0, // we always fall back to the defaults anyway -- cgit v1.2.3-70-g09d2