Skip to content

Commit f2c12f8

Browse files
authored
c++14 minimum (#7795)
1 parent df75d3f commit f2c12f8

File tree

2 files changed

+2
-40
lines changed

2 files changed

+2
-40
lines changed

libs/openFrameworks/utils/ofConstants.h

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -415,12 +415,6 @@ typedef TESSindex ofIndexType;
415415
#endif
416416
#endif
417417

418-
#endif
419-
//------------------------------------------------ c++11
420-
// check if the compiler supports c++11. vs hasn't updated the value
421-
// of __cplusplus so we need to check for vs >= 2012 (1700)
422-
#if __cplusplus>=201103 || _MSC_VER >= 1700
423-
#define HAS_CPP11 1
424418
#endif
425419

426420
//------------------------------------------------ thread local storage
@@ -436,38 +430,6 @@ typedef TESSindex ofIndexType;
436430
#endif
437431
#endif
438432

439-
//------------------------------------------------ make_unique
440-
// This is a helper method for make unique on platforms that support C++11, but not C++14.
441-
#if !defined(NO_OF_MAKE_UNIQUE) && (defined(_MSC_VER) && _MSC_VER < 1800) || (!defined(_MSC_VER) && __cplusplus <= 201103L)
442-
443-
// Implementation for C++11 platforms that do not yet have std::make_unique.
444-
// Implementation from http://stackoverflow.com/a/13512344/1518329
445-
namespace std {
446-
447-
448-
template <typename T, typename... Args>
449-
std::unique_ptr<T> make_unique_helper(std::false_type, Args&&... args) {
450-
return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
451-
}
452-
453-
template <typename T, typename... Args>
454-
std::unique_ptr<T> make_unique_helper(std::true_type, Args&&... args) {
455-
static_assert(std::extent<T>::value == 0,
456-
"make_unique<T[N]>() is forbidden, please use make_unique<T[]>().");
457-
458-
typedef typename std::remove_extent<T>::type U;
459-
return std::unique_ptr<T>(new U[sizeof...(Args)]{std::forward<Args>(args)...});
460-
}
461-
462-
template <typename T, typename... Args>
463-
std::unique_ptr<T> make_unique(Args&&... args) {
464-
return make_unique_helper<T>(std::is_array<T>(), std::forward<Args>(args)...);
465-
}
466-
467-
468-
} // namespace std
469-
470-
#endif
471433

472434

473435
// If you are building with c++17 or newer std filesystem will be enabled by default

libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
//// define which C++ library is required to build, based on target architecture
22
CLANG_CXX_LIBRARY = libc++
3-
CLANG_CXX_LANGUAGE_STANDARD = c++11
3+
CLANG_CXX_LANGUAGE_STANDARD = c++14
44

55
CLANG_ENABLE_OBJC_ARC = YES
66

7-
MACOSX_DEPLOYMENT_TARGET = 10.9
7+
MACOSX_DEPLOYMENT_TARGET = 10.13
88

99

1010
HEADER_OF = "$(OF_PATH)/libs/openFrameworks/**"

0 commit comments

Comments
 (0)