boostorg/core
1
0
Fork 1
mirror of https://github.com/boostorg/core.git synced 2025-11-30 06:09:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only checking BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION is sufficient

Browse Source
This commit is contained in:
Glen Fernandes
2018-01-27 09:42:02 -05:00
parent 23f10ab4bf
commit dbb3305050
3 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/to_address_test.cpp
View File

@@ -32,8 +32,7 @@ private:
P1<T> p_;
};
#if !defined(BOOST_NO_CXX11_SFINAE_EXPR) && \
!defined(BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION)
#if !defined(BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION)
template<class T>
class P3 {
public:
@@ -47,14 +46,12 @@ private:
};
namespace boost {
template<class T>
struct pointer_traits<P3<T> > {
static T* to_address(const P3<T>& p) BOOST_NOEXCEPT {
return p.get();
}
};
} /* boost */
template<class T>
@@ -73,14 +70,12 @@ private:
};
namespace boost {
template<class T>
struct pointer_traits<P4<T> > {
static T* to_address(const P4<T>& p) BOOST_NOEXCEPT {
return p.get();
}
};
} /* boost */
#if !defined(BOOST_NO_CXX11_POINTER_TRAITS)
@@ -97,14 +92,12 @@ private:
};
namespace std {
template<class T>
struct pointer_traits<P5<T> > {
static T* to_address(const P5<T>& p) BOOST_NOEXCEPT {
return p.get();
}
};
} /* std */
template<class T>
@@ -120,27 +113,22 @@ private:
};
namespace boost {
template<class T>
struct pointer_traits<P6<T> > {
static T* to_address(const P6<T>& p) BOOST_NOEXCEPT {
return p.get();
}
};
} /* boost */
namespace std {
template<class T>
struct pointer_traits<P6<T> > {
static T* to_address(const P6<T>& p) BOOST_NOEXCEPT {
return 0;
}
};
} /* std */
#endif
#endif
@@ -154,8 +142,7 @@ int main()
BOOST_TEST(boost::to_address(p1) == &i);
P2<int> p2(&i);
BOOST_TEST(boost::to_address(p2) == &i);
#if !defined(BOOST_NO_CXX11_SFINAE_EXPR) && \
!defined(BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION)
#if !defined(BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION)
P3<int> p3(&i);
BOOST_TEST(boost::to_address(p3) == &i);
P4<int> p4(&i);