[libcxx] r192051 - Add tests making sure that optional<T>s can be compared at compile time; this functionality was enabled by N3789
Marshall Clow
mclow.lists at gmail.com
Sat Oct 5 16:29:17 PDT 2013
Author: marshall
Date: Sat Oct 5 18:29:16 2013
New Revision: 192051
URL: http://llvm.org/viewvc/llvm-project?rev=192051&view=rev
Log:
Add tests making sure that optional<T>s can be compared at compile time; this functionality was enabled by N3789
Modified:
libcxx/trunk/test/utilities/optional/optional.comp_with_t/equal.pass.cpp
libcxx/trunk/test/utilities/optional/optional.comp_with_t/less_than.pass.cpp
libcxx/trunk/test/utilities/optional/optional.relops/equal.pass.cpp
libcxx/trunk/test/utilities/optional/optional.relops/less_than.pass.cpp
Modified: libcxx/trunk/test/utilities/optional/optional.comp_with_t/equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/optional/optional.comp_with_t/equal.pass.cpp?rev=192051&r1=192050&r2=192051&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/optional/optional.comp_with_t/equal.pass.cpp (original)
+++ libcxx/trunk/test/utilities/optional/optional.comp_with_t/equal.pass.cpp Sat Oct 5 18:29:16 2013
@@ -14,11 +14,25 @@
#include <optional>
+#if _LIBCPP_STD_VER > 11
+
+struct X
+{
+ int i_;
+
+ constexpr X(int i) : i_(i) {}
+};
+
+constexpr bool operator == ( const X &rhs, const X &lhs )
+ { return rhs.i_ == lhs.i_ ; }
+
+#endif
+
int main()
{
#if _LIBCPP_STD_VER > 11
{
- typedef int T;
+ typedef X T;
typedef std::optional<T> O;
constexpr T val(2);
@@ -26,16 +40,16 @@ int main()
constexpr O o2{1}; // engaged
constexpr O o3{val}; // engaged
- static_assert ( !(o1 == 1), "" );
- static_assert ( o2 == 1, "" );
- static_assert ( !(o3 == 1), "" );
- static_assert ( o3 == 2 , "" );
+ static_assert ( !(o1 == T(1)), "" );
+ static_assert ( o2 == T(1), "" );
+ static_assert ( !(o3 == T(1)), "" );
+ static_assert ( o3 == T(2) , "" );
static_assert ( o3 == val, "" );
- static_assert ( !(1 == o1), "" );
- static_assert ( 1 == o2, "" );
- static_assert ( !(1 == o3), "" );
- static_assert ( 2 == o3 , "" );
+ static_assert ( !(T(1) == o1), "" );
+ static_assert ( T(1) == o2, "" );
+ static_assert ( !(T(1) == o3), "" );
+ static_assert ( T(2) == o3 , "" );
static_assert ( val == o3 , "" );
}
#endif
Modified: libcxx/trunk/test/utilities/optional/optional.comp_with_t/less_than.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/optional/optional.comp_with_t/less_than.pass.cpp?rev=192051&r1=192050&r2=192051&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/optional/optional.comp_with_t/less_than.pass.cpp (original)
+++ libcxx/trunk/test/utilities/optional/optional.comp_with_t/less_than.pass.cpp Sat Oct 5 18:29:16 2013
@@ -23,22 +23,9 @@ struct X
constexpr X(int i) : i_(i) {}
};
-namespace std
-{
-
-template <>
-struct less<X>
-{
- constexpr
- bool
- operator()(const X& x, const X& y) const
- {
- return x.i_ < y.i_;
- }
-};
-
-}
-
+constexpr bool operator < ( const X &rhs, const X &lhs )
+ { return rhs.i_ < lhs.i_ ; }
+
#endif
int main()
Modified: libcxx/trunk/test/utilities/optional/optional.relops/equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/optional/optional.relops/equal.pass.cpp?rev=192051&r1=192050&r2=192051&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/optional/optional.relops/equal.pass.cpp (original)
+++ libcxx/trunk/test/utilities/optional/optional.relops/equal.pass.cpp Sat Oct 5 18:29:16 2013
@@ -15,11 +15,25 @@
#include <type_traits>
#include <cassert>
+#if _LIBCPP_STD_VER > 11
+
+struct X
+{
+ int i_;
+
+ constexpr X(int i) : i_(i) {}
+};
+
+constexpr bool operator == ( const X &rhs, const X &lhs )
+ { return rhs.i_ == lhs.i_ ; }
+
+#endif
+
int main()
{
#if _LIBCPP_STD_VER > 11
{
- typedef int T;
+ typedef X T;
typedef std::optional<T> O;
constexpr O o1; // disengaged
Modified: libcxx/trunk/test/utilities/optional/optional.relops/less_than.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/optional/optional.relops/less_than.pass.cpp?rev=192051&r1=192050&r2=192051&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/optional/optional.relops/less_than.pass.cpp (original)
+++ libcxx/trunk/test/utilities/optional/optional.relops/less_than.pass.cpp Sat Oct 5 18:29:16 2013
@@ -22,21 +22,8 @@ struct X
constexpr X(int i) : i_(i) {}
};
-namespace std
-{
-
-template <>
-struct less<X>
-{
- constexpr
- bool
- operator()(const X& x, const X& y) const
- {
- return x.i_ < y.i_;
- }
-};
-
-}
+constexpr bool operator < ( const X &rhs, const X &lhs )
+ { return rhs.i_ < lhs.i_ ; }
#endif
More information about the cfe-commits
mailing list