Remove nested namespace cast in preparaton for formal review, fix spacing.

[SVN r8370]
This commit is contained in:
Beman Dawes
2000-11-30 19:10:30 +00:00
parent 4728acd652
commit beb912a139

View File

@@ -9,8 +9,11 @@
// See http://www.boost.org for most recent version including documentation. // See http://www.boost.org for most recent version including documentation.
// Revision History // Revision History
// 29 Nov 00 Remove nested namespace cast, cleanup spacing before Formal
// Review (Beman Dawes)
// 19 Oct 00 Fix numeric_cast for floating-point types (Dave Abrahams) // 19 Oct 00 Fix numeric_cast for floating-point types (Dave Abrahams)
// 15 Jul 00 Suppress numeric_cast warnings for GCC, Borland and MSVC (Dave Abrahams) // 15 Jul 00 Suppress numeric_cast warnings for GCC, Borland and MSVC
// (Dave Abrahams)
// 30 Jun 00 More MSVC6 wordarounds. See comments below. (Dave Abrahams) // 30 Jun 00 More MSVC6 wordarounds. See comments below. (Dave Abrahams)
// 28 Jun 00 Removed implicit_cast<>. See comment below. (Beman Dawes) // 28 Jun 00 Removed implicit_cast<>. See comment below. (Beman Dawes)
// 27 Jun 00 More MSVC6 workarounds // 27 Jun 00 More MSVC6 workarounds
@@ -49,16 +52,13 @@
namespace boost namespace boost
{ {
namespace detail { namespace detail
{
template <class T> struct type_wrapper {}; template <class T> struct type_wrapper {};
} }
#if !(defined(BOOST_MSVC) && BOOST_MSVC <= 1200) // 1200 = VC6
namespace cast
{
#endif
// See the documentation for descriptions of how to choose between // See the documentation for descriptions of how to choose between
// static_cast<>, dynamic_cast<>, polymorphic_cast<>. and down_cast<> // static_cast<>, dynamic_cast<>, polymorphic_cast<> and polymorphic_downcast<>
// polymorphic_cast --------------------------------------------------------// // polymorphic_cast --------------------------------------------------------//
@@ -179,7 +179,7 @@ namespace boost
>::template limits<T> >::template limits<T>
{ {
}; };
} } // namespace detail
// less_than_type_min - // less_than_type_min -
// x_is_signed should be numeric_limits<X>::is_signed // x_is_signed should be numeric_limits<X>::is_signed
@@ -264,7 +264,8 @@ namespace boost
#else // use #pragma hacks if available #else // use #pragma hacks if available
namespace detail { namespace detail
{
# if BOOST_MSVC # if BOOST_MSVC
# pragma warning(push) # pragma warning(push)
# pragma warning(disable : 4018) # pragma warning(disable : 4018)
@@ -287,7 +288,7 @@ namespace boost
#elif defined(__BORLANDC__) #elif defined(__BORLANDC__)
#pragma option pop #pragma option pop
# endif # endif
} } // namespace detail
#endif #endif
@@ -334,25 +335,7 @@ namespace boost
throw bad_numeric_cast(); throw bad_numeric_cast();
} }
return static_cast<Target>(arg); return static_cast<Target>(arg);
} } // numeric_cast
// Visual C++ workarounds --------------------------------------------------//
# if !(defined(BOOST_MSVC) && BOOST_MSVC <= 1200) // 1200 = VC6
} // namespace cast
using ::boost::cast::polymorphic_cast;
using ::boost::cast::polymorphic_downcast;
using ::boost::cast::bad_numeric_cast;
using ::boost::cast::numeric_cast;
# else
namespace cast {
using ::boost::polymorphic_cast;
using ::boost::polymorphic_downcast;
using ::boost::bad_numeric_cast;
using ::boost::numeric_cast;
}
# endif
# undef BOOST_EXPLICIT_DEFAULT_TARGET # undef BOOST_EXPLICIT_DEFAULT_TARGET
# undef BOOST_EXPLICIT_TARGET # undef BOOST_EXPLICIT_TARGET