Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Value: Use variant of enable_if to fix MakeString/MakeRaw in GCC.

Browse Source 
Tested on GCC 4.8, GCC 4.9, and clang 3.6.
This commit is contained in:
Peter Johnson
2015-08-22 14:01:33 -07:00
parent 96bf5c24b5
commit a8836b7665
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/nt_Value.h
View File

@@ -107,7 +107,8 @@ class Value {
#ifdef _MSC_VER
template <typename T, typename = std::enable_if_t<std::is_same<T, std::string>>>
#else
template <typename T>
template <typename T,
typename std::enable_if<std::is_same<T, std::string>::value>::type>
#endif
static std::shared_ptr<Value> MakeString(T&& value) {
auto val = std::make_shared<Value>(NT_STRING, private_init());
@@ -126,7 +127,8 @@ class Value {
#ifdef _MSC_VER
template <typename T, typename = std::enable_if_t<std::is_same<T, std::string>>>
#else
template <typename T>
template <typename T,
typename std::enable_if<std::is_same<T, std::string>::value>::type>
#endif
static std::shared_ptr<Value> MakeRaw(T&& value) {
auto val = std::make_shared<Value>(NT_RAW, private_init());