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

random.tcc (subtract_with_carry_01<>:: seed(_Gen&, false_type)): Fix _M_carry initialization. 

2006-08-22  Paolo Carlini  <pcarlini@suse.de>

	* include/tr1/random.tcc (subtract_with_carry_01<>::
      	seed(_Gen&, false_type)): Fix _M_carry initialization.
	
	* testsuite/tr1/5_numerical_facilities/random/
	subtract_with_carry/cons/default.cc: Qualify 1 as 1UL.
	* testsuite/tr1/5_numerical_facilities/random/
	subtract_with_carry/cons/gen1.cc: Likewise.

From-SVN: r116334
This commit is contained in:
Paolo Carlini 2006-08-22 22:57:53 +00:00 committed by Paolo Carlini
parent a25ce4dbf9
commit 53fdb33908
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,13 @@
2006-08-22 Paolo Carlini <pcarlini@suse.de>
* include/tr1/random.tcc (subtract_with_carry_01<>::
seed(_Gen&, false_type)): Fix _M_carry initialization.
* testsuite/tr1/5_numerical_facilities/random/
subtract_with_carry/cons/default.cc: Qualify 1 as 1UL.
* testsuite/tr1/5_numerical_facilities/random/
subtract_with_carry/cons/gen1.cc: Likewise.
2006-08-22 Paolo Carlini <pcarlini@suse.de>
* include/tr1/random (class subtract_with_carry_01<>): Add.

10
libstdc++-v3/include/tr1/random.tcc
View File

@ -484,7 +484,15 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
_M_x[__i][__n - 1] = __mod<_UInt32Type, 1, 0,
_Shift<_UInt32Type, __w % 32>::__value>(__gen());
}
_M_carry = (_M_x[long_lag - 1][0] == 0) ? 1 : 0;
_M_carry = 1;
for (int __j = 0; __j < __n; ++__j)
if (_M_x[long_lag - 1][__j] != 0)
{
_M_carry = 0;
break;
}
_M_p = 0;
// Initialize the array holding the negative powers of 2.

2
libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/subtract_with_carry/cons/default.cc
View File

@ -32,7 +32,7 @@ test01()
subtract_with_carry<unsigned long, (1UL << 24), 10, 24> x;
VERIFY( x.min() == 0 );
VERIFY( x.max() == ((1<<24)-1) );
VERIFY( x.max() == ((1UL << 24) - 1) );
VERIFY( x() == 15039276 );
}

2
libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/subtract_with_carry/cons/gen1.cc
View File

@ -40,7 +40,7 @@ test01()
subtract_with_carry<unsigned long, (1UL << 24), 10, 24> x(gen);
VERIFY( x.min() == 0 );
VERIFY( x.max() == ((1 << 24) - 1) );
VERIFY( x.max() == ((1UL << 24) - 1) );
}
int main()