mirror of
https://github.com/scratchfoundation/bgfx.git
synced 2024-11-28 18:45:54 -05:00
Merge branch 'master' of github.com:bkaradzic/bgfx
This commit is contained in:
commit
ff8cc805fe
1 changed files with 11 additions and 8 deletions
|
@ -96,11 +96,14 @@ namespace tinystl
|
||||||
# include <TINYSTL/unordered_set.h>
|
# include <TINYSTL/unordered_set.h>
|
||||||
namespace stl = tinystl;
|
namespace stl = tinystl;
|
||||||
#else
|
#else
|
||||||
namespace std { namespace tr1 {} using namespace tr1; } // namespace std
|
|
||||||
# include <string>
|
# include <string>
|
||||||
# include <unordered_map>
|
# include <unordered_map>
|
||||||
# include <unordered_set>
|
# include <unordered_set>
|
||||||
namespace stl = std;
|
namespace std { namespace tr1 {} }
|
||||||
|
namespace stl {
|
||||||
|
using namespace std;
|
||||||
|
using namespace std::tr1;
|
||||||
|
}
|
||||||
#endif // BGFX_CONFIG_USE_TINYSTL
|
#endif // BGFX_CONFIG_USE_TINYSTL
|
||||||
#include <list>
|
#include <list>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue