boostorg/optional
1
0
Fork 1
mirror of https://github.com/boostorg/optional.git synced 2025-07-30 04:27:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed syntax of optional_swap_should_use_default_constructor and swap template specializations that I added 2 days ago (changeset [45265]). Was accepted by MSVC, but rejected by other compilers.

Browse Source 
[SVN r45295]
This commit is contained in:
Niels Dekker
2008-05-12 13:29:52 +00:00
parent 63f6e7f45e
commit 3ebabcb2d8
1 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
test/optional_test.cpp
View File

@ -10,7 +10,7 @@
// fernando_cacciola@hotmail.com // fernando_cacciola@hotmail.com
// //
// Revisions: // Revisions:
// 10 May 2008 (added more swap tests) // 12 May 2008 (added more swap tests)
// //
#include<iostream> #include<iostream>
#include<stdexcept> #include<stdexcept>
@ -1099,50 +1099,65 @@ namespace optional_swap_test
} // End of namespace optional_swap_test. } // End of namespace optional_swap_test.
namespace boost {
// //
// Compile time tweaking on whether or not swap should use the default constructor: // Compile time tweaking on whether or not swap should use the default constructor:
// //
template <> struct boost::optional_swap_should_use_default_constructor<
optional_swap_test::class_whose_default_ctor_should_be_used> : boost::mpl::true_ {} ;
template <> struct boost::optional_swap_should_use_default_constructor< template <> struct optional_swap_should_use_default_constructor<
optional_swap_test::class_whose_default_ctor_should_not_be_used> : boost::mpl::false_ {} ; optional_swap_test::class_whose_default_ctor_should_be_used> : mpl::true_ {} ;
template <> struct optional_swap_should_use_default_constructor<
optional_swap_test::class_whose_default_ctor_should_not_be_used> : mpl::false_ {} ;
template <class T> struct optional_swap_should_use_default_constructor<
optional_swap_test::template_whose_default_ctor_should_be_used<T> > : mpl::true_ {} ;
template <class T> struct boost::optional_swap_should_use_default_constructor<
optional_swap_test::template_whose_default_ctor_should_be_used<T> > : boost::mpl::true_ {} ;
// //
// Swap specializations: // Specialization of boost::swap:
// //
template <> template <>
void boost::swap(boost::optional<optional_swap_test::class_whose_explicit_ctor_should_be_used> & x, boost::optional<optional_swap_test::class_whose_explicit_ctor_should_be_used> & y) void swap(optional<optional_swap_test::class_whose_explicit_ctor_should_be_used> & x, optional<optional_swap_test::class_whose_explicit_ctor_should_be_used> & y)
{
optional_swap_test::swap(x, y);
}
} // namespace boost
namespace std {
//
// Specializations of std::swap:
//
template <>
void swap(optional_swap_test::class_whose_default_ctor_should_be_used & x, optional_swap_test::class_whose_default_ctor_should_be_used & y)
{ {
optional_swap_test::swap(x, y); optional_swap_test::swap(x, y);
} }
template <> template <>
void std::swap(optional_swap_test::class_whose_default_ctor_should_be_used & x, optional_swap_test::class_whose_default_ctor_should_be_used & y) void swap(optional_swap_test::class_whose_default_ctor_should_not_be_used & x, optional_swap_test::class_whose_default_ctor_should_not_be_used & y)
{ {
optional_swap_test::swap(x, y); optional_swap_test::swap(x, y);
} }
template <> template <>
void std::swap(optional_swap_test::class_whose_default_ctor_should_not_be_used & x, optional_swap_test::class_whose_default_ctor_should_not_be_used & y) void swap(optional_swap_test::class_without_default_ctor & x, optional_swap_test::class_without_default_ctor & y)
{ {
optional_swap_test::swap(x, y); optional_swap_test::swap(x, y);
} }
template <> template <>
void std::swap(optional_swap_test::class_without_default_ctor & x, optional_swap_test::class_without_default_ctor & y) void swap(optional_swap_test::class_whose_explicit_ctor_should_be_used & x, optional_swap_test::class_whose_explicit_ctor_should_be_used & y)
{ {
optional_swap_test::swap(x, y); optional_swap_test::swap(x, y);
} }
template <> } // namespace std
void std::swap(optional_swap_test::class_whose_explicit_ctor_should_be_used & x, optional_swap_test::class_whose_explicit_ctor_should_be_used & y)
{
optional_swap_test::swap(x, y);
}
// //