From b4adf3f5dd34d8171f10a6a4ee8689286ef4d66a Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Tue, 21 Jul 2015 00:33:36 +0200
Subject: Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler

(cherry picked from commit a22e4e121a1e54b2f4154d59623ee4a94a449176)

Conflicts:
	cmake/compiler/msvc/settings.cmake
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Garrison/Garrison.cpp
	src/server/game/Garrison/GarrisonMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Server/Packets/ChannelPackets.h
	src/server/game/Server/Packets/PartyPackets.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/Spells/SpellScript.cpp
	src/server/scripts/Commands/cs_list.cpp
---
 src/server/shared/Logging/AppenderFile.h | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/server/shared/Logging/AppenderFile.h')

diff --git a/src/server/shared/Logging/AppenderFile.h b/src/server/shared/Logging/AppenderFile.h
index 36afdd23ad1..4082b34a2b4 100644
--- a/src/server/shared/Logging/AppenderFile.h
+++ b/src/server/shared/Logging/AppenderFile.h
@@ -24,21 +24,20 @@
 class AppenderFile: public Appender
 {
     public:
-        AppenderFile(uint8 _id, std::string const& _name, LogLevel level, const char* filename, const char* logDir, const char* mode, AppenderFlags flags, uint64 maxSize);
+        AppenderFile(uint8 id, std::string const& name, LogLevel level, const char* filename, const char* logDir, const char* mode, AppenderFlags flags, uint64 maxSize);
         ~AppenderFile();
-        FILE* OpenFile(std::string const& _name, std::string const& _mode, bool _backup);
+        FILE* OpenFile(std::string const& name, std::string const& mode, bool backup);
 
     private:
         void CloseFile();
         void _write(LogMessage const* message) override;
         FILE* logfile;
-        std::string filename;
-        std::string logDir;
-        std::string mode;
-        bool dynamicName;
-        bool backup;
-        uint64 maxFileSize;
-        std::atomic<uint64> fileSize;
+        std::string _fileName;
+        std::string _logDir;
+        bool _dynamicName;
+        bool _backup;
+        uint64 _maxFileSize;
+        std::atomic<uint64> _fileSize;
 };
 
 #endif
-- 
cgit v1.2.3