diff options
| author | Andrew Wiggin <ender79bl@gmail.com> | 2011-09-25 16:33:51 +0400 |
|---|---|---|
| committer | Andrew Wiggin <ender79bl@gmail.com> | 2011-09-25 16:33:51 +0400 |
| commit | 7c46f1c4b77873c27485bc278e04195611237602 (patch) | |
| tree | d1b92fda781d736bc8f3ebb0902876651bac6ff0 /intern | |
| parent | 274b9c8fb88ff6499ac3b13a081c1e60965e459e (diff) | |
Fix some MSVC 2010 warnings (including one apparent bug in intern/elbeem/intern/solver_relax.h)
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/elbeem/intern/solver_relax.h | 2 | ||||
| -rw-r--r-- | intern/smoke/intern/MERSENNETWISTER.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/elbeem/intern/solver_relax.h b/intern/elbeem/intern/solver_relax.h index f0910a6b2e3..54adf9f4b70 100644 --- a/intern/elbeem/intern/solver_relax.h +++ b/intern/elbeem/intern/solver_relax.h @@ -390,7 +390,7 @@ #define DEFAULT_STREAM \ m[dC] = RAC(ccel,dC); \ \ - if((!nbored & CFBnd)) { \ + if(!(nbored & CFBnd)) { \ \ m[dN ] = CSRC_N ; m[dS ] = CSRC_S ; \ m[dE ] = CSRC_E ; m[dW ] = CSRC_W ; \ diff --git a/intern/smoke/intern/MERSENNETWISTER.h b/intern/smoke/intern/MERSENNETWISTER.h index e976560bf17..116568c2834 100644 --- a/intern/smoke/intern/MERSENNETWISTER.h +++ b/intern/smoke/intern/MERSENNETWISTER.h @@ -132,7 +132,7 @@ protected: uint32 mixBits( const uint32& u, const uint32& v ) const { return hiBit(u) | loBits(v); } uint32 twist( const uint32& m, const uint32& s0, const uint32& s1 ) const - { return m ^ (mixBits(s0,s1)>>1) ^ (-loBit(s1) & 0x9908b0dfUL); } + { return m ^ (mixBits(s0,s1)>>1) ^ ((~loBit(s1) + 1) & 0x9908b0dfUL); } static uint32 hash( time_t t, clock_t c ); }; |