diff options
| author | megamage <none@none> | 2009-04-15 17:14:17 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-04-15 17:14:17 -0500 |
| commit | 5b124bf73fdc5eee3d53c6d041f7d82aa1112073 (patch) | |
| tree | d9625b20bafc8e1c26d731daf0f417545612ef57 /src/game | |
| parent | 1f55614e7038cde7bdb7b3fdf898a0abae42623e (diff) | |
| parent | c61ab4c9a0b68655f857670798cd9a024232b67f (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/Map.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/game/Map.h b/src/game/Map.h index 3d533da1675..fe29f448d27 100644 --- a/src/game/Map.h +++ b/src/game/Map.h @@ -479,6 +479,8 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O typedef std::set<WorldObject*> ActiveNonPlayers; ActiveNonPlayers m_activeNonPlayers; ActiveNonPlayers::iterator m_activeNonPlayersIter; + + private: typedef GridReadGuard ReadGuard; typedef GridWriteGuard WriteGuard; |