Compare commits

..

3 Commits

Author SHA1 Message Date
nobody 2b8aaa089f This commit was manufactured by cvs2svn to create tag
'Version_1_18_3'.

[SVN r8252]
2000-11-18 14:33:52 +00:00
John Maddock e3ecdf7a27 fixes for Borland C++ Builder
[SVN r8135]
2000-11-04 12:39:28 +00:00
Dave Abrahams 02436dd1c6 Added a fix for compilers sensitive to the presence of "template" on template
members of templates (e.g. EDG-based compilers like CXX on the Alpha)


[SVN r8129]
2000-11-04 09:00:02 +00:00
+15 -2
View File
@@ -117,10 +117,13 @@ namespace boost
// numeric_cast ------------------------------------------------------------//
// Move to config.hpp?
#if defined(__SGI_STL_PORT) && __SGI_STL_PORT <= 0x400 && __STL_STATIC_CONST_INIT_BUG
#if defined(_RWSTD_VER) || (defined(__SGI_STL_PORT) && __SGI_STL_PORT <= 0x400 && __STL_STATIC_CONST_INIT_BUG)
// STLPort 4.0 doesn't define the static constants in numeric_limits<> so that they
// can be used at compile time if the compiler bug indicated by
// __STL_STATIC_CONST_INIT_BUG is present.
// Rogue wave STL (C++ Builder) also has broken numeric_limits
// with default template defining members out of line.
# define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
#endif
@@ -156,7 +159,9 @@ namespace boost
// Move to namespace boost in utility.hpp?
template <class T>
struct fixed_numeric_limits
: public numeric_min_select<std::numeric_limits<T>::is_signed>::limits<T>
: public numeric_min_select<
std::numeric_limits<T>::is_signed
>::template limits<T>
{
};
}
@@ -249,6 +254,8 @@ namespace boost
# pragma warning(push)
# pragma warning(disable : 4018)
# pragma warning(disable : 4146)
#elif defined(__BORLANDC__)
#pragma option push -w-8041
# endif
// Move to namespace boost in utility.hpp?
template <class T>
@@ -262,6 +269,8 @@ namespace boost
};
# if BOOST_MSVC
# pragma warning(pop)
#elif defined(__BORLANDC__)
#pragma option pop
# endif
}
@@ -294,12 +303,16 @@ namespace boost
# if BOOST_MSVC
# pragma warning(push)
# pragma warning(disable : 4018)
#elif defined(__BORLANDC__)
#pragma option push -w-8012
# endif
if ((arg < 0 && !result_traits::is_signed) // loss of negative range
|| (arg_traits::is_signed && arg < result_traits::min()) // underflow
|| arg > result_traits::max()) // overflow
# if BOOST_MSVC
# pragma warning(pop)
#elif defined(__BORLANDC__)
#pragma option pop
# endif
#endif
{