mirror of
https://github.com/bkaradzic/bx.git
synced 2026-02-17 20:52:37 +01:00
Enable C++11 toolchain.
This commit is contained in:
@@ -5,7 +5,6 @@ os:
|
||||
|
||||
environment:
|
||||
matrix:
|
||||
- TOOLSET: vs2010
|
||||
- TOOLSET: vs2012
|
||||
- TOOLSET: vs2013
|
||||
- TOOLSET: vs2015
|
||||
|
||||
@@ -81,7 +81,4 @@ namespace bx
|
||||
|
||||
} // namespace bx
|
||||
|
||||
// Annoying C++0x stuff..
|
||||
//namespace std { namespace tr1 {}; using namespace tr1; }
|
||||
|
||||
#endif // BX_H_HEADER_GUARD
|
||||
|
||||
@@ -597,7 +597,7 @@ function toolchain(_buildDir, _libDir)
|
||||
"-Wundef",
|
||||
}
|
||||
buildoptions_cpp {
|
||||
"-std=c++0x",
|
||||
"-std=c++11",
|
||||
}
|
||||
linkoptions {
|
||||
"-Wl,--gc-sections",
|
||||
@@ -679,7 +679,7 @@ function toolchain(_buildDir, _libDir)
|
||||
"-Wundef",
|
||||
}
|
||||
buildoptions_cpp {
|
||||
"-std=c++0x",
|
||||
"-std=c++11",
|
||||
}
|
||||
links {
|
||||
"rt",
|
||||
@@ -730,7 +730,7 @@ function toolchain(_buildDir, _libDir)
|
||||
"-Wundef",
|
||||
}
|
||||
buildoptions_cpp {
|
||||
"-std=c++0x",
|
||||
"-std=c++11",
|
||||
}
|
||||
links {
|
||||
"rt",
|
||||
@@ -749,7 +749,7 @@ function toolchain(_buildDir, _libDir)
|
||||
"-Wundef",
|
||||
}
|
||||
buildoptions_cpp {
|
||||
"-std=c++0x",
|
||||
"-std=c++11",
|
||||
}
|
||||
links {
|
||||
"rt",
|
||||
@@ -792,7 +792,7 @@ function toolchain(_buildDir, _libDir)
|
||||
"-Wundef",
|
||||
}
|
||||
buildoptions_cpp {
|
||||
"-std=c++0x",
|
||||
"-std=c++11",
|
||||
}
|
||||
linkoptions {
|
||||
"-no-canonical-prefixes",
|
||||
@@ -811,7 +811,7 @@ function toolchain(_buildDir, _libDir)
|
||||
"__STEAMLINK__=1", -- There is no special prefedined compiler symbol to detect SteamLink, faking it.
|
||||
}
|
||||
buildoptions {
|
||||
"-std=c++0x",
|
||||
"-std=c++11",
|
||||
"-Wfatal-errors",
|
||||
"-Wunused-value",
|
||||
"-Wundef",
|
||||
@@ -931,7 +931,7 @@ function toolchain(_buildDir, _libDir)
|
||||
"-Wundef",
|
||||
}
|
||||
buildoptions_cpp {
|
||||
"-std=c++0x",
|
||||
"-std=c++11",
|
||||
}
|
||||
includedirs {
|
||||
"$(NACL_SDK_ROOT)/include",
|
||||
@@ -1184,7 +1184,7 @@ function toolchain(_buildDir, _libDir)
|
||||
buildoptions {
|
||||
}
|
||||
buildoptions_cpp {
|
||||
"-std=c++0x",
|
||||
"-std=c++11",
|
||||
}
|
||||
linkoptions {
|
||||
}
|
||||
@@ -1200,7 +1200,7 @@ function toolchain(_buildDir, _libDir)
|
||||
"-Wundef",
|
||||
}
|
||||
buildoptions_cpp {
|
||||
"-std=c++0x",
|
||||
"-std=c++11",
|
||||
}
|
||||
|
||||
configuration { "rpi" }
|
||||
@@ -1219,7 +1219,7 @@ function toolchain(_buildDir, _libDir)
|
||||
"-Wundef",
|
||||
}
|
||||
buildoptions_cpp {
|
||||
"-std=c++0x",
|
||||
"-std=c++11",
|
||||
}
|
||||
includedirs {
|
||||
"/opt/vc/include",
|
||||
@@ -1245,7 +1245,7 @@ function toolchain(_buildDir, _libDir)
|
||||
"--sysroot=$(RISCV_DIR)/sysroot",
|
||||
}
|
||||
buildoptions_cpp {
|
||||
"-std=c++0x",
|
||||
"-std=c++11",
|
||||
}
|
||||
|
||||
configuration {} -- reset configuration
|
||||
|
||||
@@ -52,7 +52,7 @@ int main()
|
||||
{
|
||||
typedef std::unordered_map<uint64_t, uint16_t> StdUnorderedMap;
|
||||
StdUnorderedMap map;
|
||||
// map.reserve(numElements);
|
||||
map.reserve(numElements);
|
||||
for (uint32_t jj = 0; jj < numElements; ++jj)
|
||||
{
|
||||
std::pair<StdUnorderedMap::iterator, bool> ok = map.insert(std::make_pair(uint64_t(jj), uint16_t(jj) ) );
|
||||
|
||||
Reference in New Issue
Block a user