claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement make_unique, only require c++11 in CMakeLists (Fixes #235, Refs#167)

Browse source
This commit is contained in:
saschawillems 2016-09-20 21:04:16 +02:00
parent 1908a0f190
commit b54e424d1b
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -31,9 +31,7 @@ message(STATUS ${VULKAN_LIB})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX -D_USE_MATH_DEFINES") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX -D_USE_MATH_DEFINES")
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-std=c++14) add_definitions(-std=c++11)
add_definitions(-std=c++0x)
add_definitions(-std=gnu++14)
file(GLOB SOURCE *.cpp base/*.cpp) file(GLOB SOURCE *.cpp base/*.cpp)

10
base/threadpool.hpp
View file

@ -12,6 +12,14 @@
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
// make_unique is not available in C++11
// Taken from Herb Sutter's blog (https://herbsutter.com/gotw/_102/)
template<typename T, typename ...Args>
std::unique_ptr<T> make_unique(Args&& ...args)
{
return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
}
namespace vkTools namespace vkTools
{ {
class Thread class Thread
@ -95,7 +103,7 @@ namespace vkTools
threads.clear(); threads.clear();
for (auto i = 0; i < count; i++) for (auto i = 0; i < count; i++)
{ {
threads.push_back(std::make_unique<Thread>()); threads.push_back(make_unique<Thread>());
} }
} }