Commit 44f37984 by Jonathan Wakely Committed by Jonathan Wakely

locale_classes.h: Simplify RTTI checks.

2007-12-17  Jonathan Wakely  <jwakely.gcc@gmail.com>

	* include/bits/locale_classes.h: Simplify RTTI checks.

From-SVN: r131020
parent 0d9f441a
2007-12-17 Jonathan Wakely <jwakely.gcc@gmail.com> 2007-12-17 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/bits/locale_classes.h: Simplify RTTI checks.
2007-12-17 Jonathan Wakely <jwakely.gcc@gmail.com>
* docs/html/test.html: Fix paths and notes on running subset of tests. * docs/html/test.html: Fix paths and notes on running subset of tests.
* docs/html/ext/parallel_mode.html: Fix markup typos. * docs/html/ext/parallel_mode.html: Fix markup typos.
* docs/html/ext/pb_ds/index.html: Likewise. * docs/html/ext/pb_ds/index.html: Likewise.
......
...@@ -579,17 +579,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -579,17 +579,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
{ {
const size_t __i = _Facet::id._M_id(); const size_t __i = _Facet::id._M_id();
const locale::facet** __facets = __loc._M_impl->_M_facets; const locale::facet** __facets = __loc._M_impl->_M_facets;
bool __b(false); return __i < __loc._M_impl->_M_facets_size
try && dynamic_cast<const _Facet*>(__facets[__i]) != NULL;
{
if (__i < __loc._M_impl->_M_facets_size
&& dynamic_cast<const _Facet*>(__facets[__i]) != NULL)
__b = true;
}
catch (...)
{ }
return __b;
} }
/** /**
...@@ -611,8 +602,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -611,8 +602,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
{ {
const size_t __i = _Facet::id._M_id(); const size_t __i = _Facet::id._M_id();
const locale::facet** __facets = __loc._M_impl->_M_facets; const locale::facet** __facets = __loc._M_impl->_M_facets;
if (__i >= __loc._M_impl->_M_facets_size if (__i >= __loc._M_impl->_M_facets_size || __facets[__i] == NULL)
|| dynamic_cast<const _Facet*>(__facets[__i]) == NULL)
__throw_bad_cast(); __throw_bad_cast();
return dynamic_cast<const _Facet&>(*__facets[__i]); return dynamic_cast<const _Facet&>(*__facets[__i]);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment