epics/pvxs
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MSVC type_traits need ::value

Browse Source 
MSVC doesn't like {} instanciation here.
This commit is contained in:
Michael Davidsaver
2020-03-29 18:17:44 -07:00
parent 5a9d884e88
commit b83c1776a5
4 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pvaproto.h
+2 -2
View File
@@ -192,7 +192,7 @@ inline void _from_wire(Buffer& buf, uint8_t *mem, bool reverse)
* @param buf output buffer. buf[0] through buf[sizeof(T)-1] must be valid.
* @param val input variable
*/
template<typename T, typename std::enable_if<sizeof(T)>=2 && std::is_scalar<T>{} && !std::is_pointer<T>{}, int>::type =0>
template<typename T, typename std::enable_if<sizeof(T)>=2 && std::is_scalar<T>::value && !std::is_pointer<T>::value, int>::type =0>
inline void to_wire(Buffer& buf, const T& val)
{
union {
@@ -203,7 +203,7 @@ inline void to_wire(Buffer& buf, const T& val)
_to_wire<sizeof(T)>(buf, pun.b, buf.be ^ hostBE);
}
template<typename T, typename std::enable_if<sizeof(T)==1 && std::is_scalar<T>{}, int>::type =0>
template<typename T, typename std::enable_if<sizeof(T)==1 && std::is_scalar<T>::value, int>::type =0>
inline void to_wire(Buffer& buf, const T& val)
{
if(!buf.ensure(1)) {
src/pvxs/data.h
+4 -4
View File
@@ -50,17 +50,17 @@ struct StorageMap;
// map signed integers to int64_t
template<typename T>
struct StorageMap<T, typename std::enable_if<std::is_integral<T>{} && std::is_signed<T>{}>::type>
struct StorageMap<T, typename std::enable_if<std::is_integral<T>::value && std::is_signed<T>::value>::type>
{ typedef int64_t store_t; static constexpr StoreType code{StoreType::Integer}; };
// map unsigned integers to uint64_t
template<typename T>
struct StorageMap<T, typename std::enable_if<std::is_integral<T>{} && !std::is_signed<T>{} && !std::is_same<T,bool>{}>::type>
struct StorageMap<T, typename std::enable_if<std::is_integral<T>::value && !std::is_signed<T>::value && !std::is_same<T,bool>::value>::type>
{ typedef uint64_t store_t; static constexpr StoreType code{StoreType::UInteger}; };
// map floating point to double. (truncates long double, but then PVA doesn't >8 byte primatives anyway support anyway)
template<typename T>
struct StorageMap<T, typename std::enable_if<std::is_floating_point<T>{}>::type>
struct StorageMap<T, typename std::enable_if<std::is_floating_point<T>::value>::type>
{ typedef double store_t; static constexpr StoreType code{StoreType::Real}; };
template<>
@@ -623,7 +623,7 @@ public:
#ifdef _DOXYGEN_
Value&
#else
typename std::enable_if<!std::is_same<T,Value>{}, Value&>::type
typename std::enable_if<!std::is_same<T,Value>::value, Value&>::type
#endif
operator=(const T& val) {
from<T>(val);
src/pvxs/sharedArray.h
+13 -21
View File
@@ -75,7 +75,7 @@ struct sizeofx {
static inline size_t op() { return sizeof(T); }
};
template<typename T>
struct sizeofx<T, typename std::enable_if<std::is_void<T>{}>::type> {
struct sizeofx<T, typename std::enable_if<std::is_void<T>::value>::type> {
static inline size_t op() { return 1u; } // treat void* as pointer to bytes
};
@@ -84,14 +84,6 @@ struct sa_default_delete {
void operator()(E* e) const { delete[] e; }
};
// use of typename std::enable_if<std::is_void<E>{}>::type
// as enabler for the shared_array<> void specialization below fails with gcc 4.8 and 4.9..
// The is_void specialization isn't being selected, but no hint is given as to why.
// This older style of enabler works though. Go figure...
template<typename T, class R = void> struct is_void {};
template<class R> struct is_void<void,R> { typedef R type; };
template<class R> struct is_void<const void,R> { typedef R type; };
template<typename E>
struct sa_base {
protected:
@@ -440,33 +432,33 @@ public:
convertTo() const;
#endif
template<typename TO, typename std::enable_if<std::is_void<TO>{} && (std::is_const<E>{} == std::is_const<TO>{}), int>::type =0>
template<typename TO, typename std::enable_if<std::is_void<TO>::value && (std::is_const<E>::value == std::is_const<TO>::value), int>::type =0>
shared_array<TO>
castTo() const {
return shared_array<TO>(this->_data, this->_data.get(), this->_count); // implied cast to void*
}
template<typename TO, typename std::enable_if<std::is_same<TO, E>{}, int>::type =0>
template<typename TO, typename std::enable_if<std::is_same<TO, E>::value, int>::type =0>
shared_array<TO>
castTo() const {
return *this;
}
// static_cast<TO>() to non-void, preserving const-ness
template<typename TO, typename std::enable_if<!std::is_void<TO>{} && (std::is_const<E>{} == std::is_const<TO>{}), int>::type =0>
template<typename TO, typename std::enable_if<!std::is_void<TO>::value && (std::is_const<E>::value == std::is_const<TO>::value), int>::type =0>
shared_array<TO>
castToUnsafe() const {
return shared_array<TO>(this->_data, static_cast<TO*>(this->_data.get()), this->_count);
}
// static_cast<TO>() to void, preserving const-ness
template<typename TO, typename std::enable_if<std::is_void<TO>{} && (std::is_const<E>{} == std::is_const<TO>{}), int>::type =0>
template<typename TO, typename std::enable_if<std::is_void<TO>::value && (std::is_const<E>::value == std::is_const<TO>::value), int>::type =0>
shared_array<TO>
castToUnsafe() const {
return shared_array<TO>(this->_data, this->_data.get(), this->_count); // implied cast to void*
}
template<typename TO, typename std::enable_if<!std::is_void<TO>{} && (std::is_const<E>{} == std::is_const<TO>{}), int>::type =0>
template<typename TO, typename std::enable_if<!std::is_void<TO>::value && (std::is_const<E>::value == std::is_const<TO>::value), int>::type =0>
shared_array<TO>
convertTo() const {
if(detail::CaptureBase<TO>::code==detail::CaptureBase<E>::code) {
@@ -495,7 +487,7 @@ public:
template<typename E>
class shared_array<E, typename detail::is_void<E>::type >
class shared_array<E, typename std::enable_if<std::is_void<E>::value>::type >
: public detail::sa_base<E>
{
static_assert (std::is_void<E>::value, "void specialization");
@@ -602,7 +594,7 @@ public:
}
// static_cast<TO>() to non-void, preserving const-ness
template<typename TO, typename std::enable_if<!std::is_void<TO>{} && (std::is_const<E>{} == std::is_const<TO>{}), int>::type =0>
template<typename TO, typename std::enable_if<!std::is_void<TO>::value && (std::is_const<E>::value == std::is_const<TO>::value), int>::type =0>
shared_array<TO>
castTo() const {
if(this->_data && _type!=detail::CaptureBase<TO>::code) {
@@ -611,21 +603,21 @@ public:
return shared_array<TO>(this->_data, static_cast<TO*>(this->_data.get()), this->_count);
}
template<typename TO, typename std::enable_if<std::is_void<TO>{} && (std::is_const<E>{} == std::is_const<TO>{}), int>::type =0>
template<typename TO, typename std::enable_if<std::is_void<TO>::value && (std::is_const<E>::value == std::is_const<TO>::value), int>::type =0>
shared_array<TO>
castTo() const {
return *this;
}
// static_cast<TO>() to non-void, preserving const-ness
template<typename TO, typename std::enable_if<!std::is_void<TO>{} && (std::is_const<E>{} == std::is_const<TO>{}), int>::type =0>
template<typename TO, typename std::enable_if<!std::is_void<TO>::value && (std::is_const<E>::value == std::is_const<TO>::value), int>::type =0>
shared_array<TO>
castToUnsafe() const {
return shared_array<TO>(this->_data, static_cast<TO*>(this->_data.get()), this->_count);
}
// static_cast<TO>() to void, preserving const-ness
template<typename TO, typename std::enable_if<std::is_void<TO>{} && (std::is_const<E>{} == std::is_const<TO>{}), int>::type =0>
template<typename TO, typename std::enable_if<std::is_void<TO>::value && (std::is_const<E>::value == std::is_const<TO>::value), int>::type =0>
shared_array<TO>
castToUnsafe() const {
// in reality this is either void -> void, or const void -> const void
@@ -633,7 +625,7 @@ public:
return *this;
}
template<typename TO, typename std::enable_if<!std::is_void<TO>{} && (std::is_const<E>{} == std::is_const<TO>{}), int>::type =0>
template<typename TO, typename std::enable_if<!std::is_void<TO>::value && (std::is_const<E>::value == std::is_const<TO>::value), int>::type =0>
shared_array<TO>
convertTo() const {
if(detail::CaptureBase<TO>::code==_type) {
@@ -647,7 +639,7 @@ public:
}
}
template<typename TO, typename std::enable_if<std::is_void<TO>{} && (std::is_const<E>{} == std::is_const<TO>{}), int>::type =0>
template<typename TO, typename std::enable_if<std::is_void<TO>::value && (std::is_const<E>::value == std::is_const<TO>::value), int>::type =0>
shared_array<TO>
convertTo() const {
return castTo<TO>();
src/sharedarray.cpp
+1 -1
View File
@@ -135,7 +135,7 @@ void printValue(std::string& dest, const bool& src)
}
template<typename Src>
typename std::enable_if<!std::is_same<Src, bool>{}>::type
typename std::enable_if<!std::is_same<Src, bool>::value>::type
printValue(std::string& dest, const Src& src)
{
std::ostringstream strm;