Author: sebor
Date: Sat Jan 3 16:18:32 2009
New Revision: 731135
URL: http://svn.apache.org/viewvc?rev=731135&view=rev
Log:
2009-01-03 Martin Sebor <se...@roguewave.com>
STDCXX-791
* include/iomanip (__rw_setbase::operator()): Added parentheses
around operands of bitwise OR to silence gcc 4.3 -Wparentheses
warning.
* examples/tutorial/alg3.cpp (RandomInteger::operator()): Replaced
addition with bitwise OR to silence said gcc warning.
Modified:
stdcxx/branches/4.2.x/examples/tutorial/alg3.cpp
stdcxx/branches/4.2.x/include/iomanip
Modified: stdcxx/branches/4.2.x/examples/tutorial/alg3.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/examples/tutorial/alg3.cpp?rev=731135&r1=731134&r2=731135&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/examples/tutorial/alg3.cpp (original)
+++ stdcxx/branches/4.2.x/examples/tutorial/alg3.cpp Sat Jan 3 16:18:32 2009
@@ -66,7 +66,7 @@
std::random_shuffle (seq, seq + sizeof seq / sizeof *seq);
const long rnd =
- (seq [0] << 11) | (seq [1] << 8) | (seq [2] << 4) + seq [3];
+ (seq [0] << 11) | (seq [1] << 8) | (seq [2] << 4) | seq [3];
return rnd % n;
}
Modified: stdcxx/branches/4.2.x/include/iomanip
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/iomanip?rev=731135&r1=731134&r2=731135&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/iomanip (original)
+++ stdcxx/branches/4.2.x/include/iomanip Sat Jan 3 16:18:32 2009
@@ -86,9 +86,9 @@
#endif // _RWSTD_NO_EXT_SETBASE
const unsigned __ifl =
- __strm.flags () & ~_STD::ios_base::basefield
- & ~( _RWSTD_STATIC_CAST (unsigned, _RWSTD_IOS_BASEMASK)
- << _RWSTD_IOS_BASEOFF)
+ ( __strm.flags () & ~_STD::ios_base::basefield
+ & ~( _RWSTD_STATIC_CAST (unsigned, _RWSTD_IOS_BASEMASK)
+ << _RWSTD_IOS_BASEOFF))
| __base << _RWSTD_IOS_BASEOFF;
__strm.flags (_STD::ios_base::fmtflags (__ifl));
