pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-04 02:06:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove 'using namespaces std' fixes #61

Browse Source
This commit is contained in:
Michael Cook
2013-05-22 16:17:19 -04:00
parent 312100e1c6
commit 0fdfe025cb
190 changed files with 1801 additions and 2004 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/ptimer.h
+3 -4
View File
@@ -21,7 +21,6 @@
#include "types.h"
#include <map>
#include <vector>
using namespace std;
enum { //values for pTimerType
pTimerStartAdventureTimer = 1,
@@ -120,13 +119,13 @@ public:
inline void SetCharID(uint32 char_id) { _char_id = char_id; }
void ToVector(vector< pair<pTimerType, PersistentTimer *> > &out);
void ToVector(std::vector< std::pair<pTimerType, PersistentTimer *> > &out);
//Clear a timer for a char not logged in
//this is not defined on a char which is logged in!
static bool ClearOffline(Database *db, uint32 char_id, pTimerType type);
typedef map<pTimerType, PersistentTimer *>::iterator iterator;
typedef std::map<pTimerType, PersistentTimer *>::iterator iterator;
iterator begin() { return(_list.begin()); }
iterator end() { return(_list.end()); }
@@ -135,7 +134,7 @@ public:
protected:
uint32 _char_id;
map<pTimerType, PersistentTimer *> _list;
std::map<pTimerType, PersistentTimer *> _list;
};
//code prettying macros