swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-08-03 03:16:01 -04:00
Code Issues Projects Releases Wiki Activity

Removed references to tr1 now that c++11 works

Browse Source
This commit is contained in:
Anonymous
2014-01-23 09:28:13 -07:00
parent e6431a9fd4
commit 210bdb91d8
56 changed files with 198 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedFoundation/src/shared/NetworkId.h
+1 -3
View File
@@ -156,8 +156,6 @@ inline size_t NetworkId::getHashValue () const
// STL standard hash function
namespace std
{
namespace tr1
{
template <>
struct hash<NetworkId> // stl standard hash
@@ -165,6 +163,6 @@ struct hash<NetworkId> // stl standard hash
size_t operator()(const NetworkId &x) const { return x.getHashValue(); }
};
}}
}
#endif
engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h
+6 -10
View File
@@ -60,12 +60,8 @@ namespace std
typedef basic_string<char, char_traits<char>, allocator<char> > string;
namespace tr1
{
template <class _T1> struct hash;
template <class _Key, class _Tp, class _Hash, class _Compare, class _Alloc> class unordered_map;
template <class _Key, class _Hash, class _Compare, class _Alloc> class unordered_set;
}
template <class _Key, class _Tp, class _Hash, class _Compare, class _Alloc> class unordered_map;
template <class _Key, class _Hash, class _Compare, class _Alloc> class unordered_set;
}
template <class _Tp, class _Alloc = std::allocator<_Tp> > struct stddeque
@@ -88,9 +84,9 @@ template <class _Key, class _Tp, class _Compare = std::less<_Key>, class _Alloc
// typedef std::hash_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd;
//};
template <class _Key, class _Tp, class _HashFcn = std::tr1::hash<_Key>, class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator< std::pair <const _Key, _Tp> > > struct stdunordered_map
template <class _Key, class _Tp, class _HashFcn = std::hash<_Key>, class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator< std::pair <const _Key, _Tp> > > struct stdunordered_map
{
typedef std::tr1::unordered_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd;
typedef std::unordered_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd;
};
template <class _Key, class _Tp, class _Compare = std::less<_Key>, class _Alloc = std::allocator< std::pair <const _Key, _Tp> > > struct stdmultimap
@@ -108,9 +104,9 @@ template <class _Key, class _Compare = std::less<_Key>, class _Alloc = std::allo
// typedef std::hash_set<_Key, _HashFcn, _Compare, _Alloc> fwd;
//};
template <class _Key, class _HashFcn = std::tr1::hash<_Key>, class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator<_Key> > struct stdunordered_set
template <class _Key, class _HashFcn = std::hash<_Key>, class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator<_Key> > struct stdunordered_set
{
typedef std::tr1::unordered_set<_Key, _HashFcn, _Compare, _Alloc> fwd;
typedef std::unordered_set<_Key, _HashFcn, _Compare, _Alloc> fwd;
};
template <class _Key, class _Compare = std::less<_Key>, class _Alloc = std::allocator<_Key> > struct stdmultiset