OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixups for -fno-for-scope

Browse Source 
2001-03-12  Benjamin Kosnik  <bkoz@redhat.com>

	Fixups for -fno-for-scope
	* include/bits/locale_facets.tcc (__match_parallel): Fixup.
	* src/valarray-inst.cc (__gslice_to_index): Same.

From-SVN: r40429
This commit is contained in:
Benjamin Kosnik 2001-03-12 21:42:57 +00:00 committed by Benjamin Kosnik
parent ba8afff635
commit db1d582c81
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2001-03-12 Benjamin Kosnik <bkoz@redhat.com>
Fixups for -fno-for-scope
* include/bits/locale_facets.tcc (__match_parallel): Fixup.
* src/valarray-inst.cc (__gslice_to_index): Same.
2001-03-12 Rodney Brown <RodneyBrown@mynd.com>
* src/gen-num-limits.cc (traps) [SPECIALIZE_TRAPPING]: Add fflush

35
libstdc++-v3/include/bits/locale_facets.tcc
View File

@ -110,47 +110,44 @@ namespace std
size_t __pos = 0;
do
{
{
int __ti = 0;
for (;__ti < __remain &&
__pos == __targets[__matches[__ti]].size(); ++__ti)
{ }
if (__ti == __remain)
{
if (__pos == 0) __remain = 0;
return __s;
}
}
int __ti = 0;
while (__ti < __remain && __pos == __targets[__matches[__ti]].size())
++__ti;
if (__ti == __remain)
{
if (__pos == 0) __remain = 0;
return __s;
}
if (__s == __end)
__eof = true;
bool __matched = false;
for (int __ti = 0; __ti < __remain; )
for (int __ti2 = 0; __ti2 < __remain; )
{
const __string_type& __target = __targets[__matches[__ti]];
const __string_type& __target = __targets[__matches[__ti2]];
if (__pos < __target.size())
{
if (__eof || __target[__pos] != *__s)
{
__matches[__ti] = __matches[--__remain];
__matches[__ti2] = __matches[--__remain];
continue;
}
__matched = true;
}
++__ti;
++__ti2;
}
if (__matched)
{
++__s;
++__pos;
}
for (int __ti = 0; __ti < __remain;)
for (int __ti3 = 0; __ti3 < __remain;)
{
if (__pos > __targets[__matches[__ti]].size())
if (__pos > __targets[__matches[__ti3]].size())
{
__matches[__ti] = __matches[--__remain];
__matches[__ti3] = __matches[--__remain];
continue;
}
++__ti;
++__ti3;
}
}
while (__remain);

10
libstdc++-v3/src/valarray-inst.cc
View File

@ -96,13 +96,13 @@ namespace std
// Process the next multi-index. The loop ought to be
// backward since we're making a lexicagraphical visit.
++__t[__n-1];
for (size_t __k=__n-1; __k; --__k)
++__t[__n - 1];
for (size_t __k2 = __n - 1; __k2; --__k2)
{
if (__t[__k] >= __l[__k])
if (__t[__k2] >= __l[__k2])
{
__t[__k] = 0;
++__t[__k-1];
__t[__k2] = 0;
++__t[__k2 - 1];
}
}
}