• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision23115 (tree)
Zeit2012-08-01 03:13:11
Autorstefankueng

Log Message

Avoid problems with compiler optimizations: declare the variable before the condition so the value isn't discarded too early.

Ändern Zusammenfassung

Diff

--- trunk/src/TortoiseMerge/MainFrm.cpp (revision 23114)
+++ trunk/src/TortoiseMerge/MainFrm.cpp (revision 23115)
@@ -824,8 +824,10 @@
824824 }
825825 else
826826 {
827- bool bGoFirstDiff = (0 != (DWORD)CRegDWORD(_T("Software\\TortoiseMerge\\FirstDiffOnLoad"), TRUE));
828- bool bGoFirstConflict = (0 != (DWORD)CRegDWORD(_T("Software\\TortoiseMerge\\FirstConflictOnLoad"), TRUE));
827+ CRegDWORD regFirstDiff = CRegDWORD(_T("Software\\TortoiseMerge\\FirstDiffOnLoad"), TRUE);
828+ CRegDWORD regFirstConflict = CRegDWORD(_T("Software\\TortoiseMerge\\FirstConflictOnLoad"), TRUE);
829+ bool bGoFirstDiff = (0 != (DWORD)regFirstDiff);
830+ bool bGoFirstConflict = (0 != (DWORD)regFirstConflict);
829831 if (bGoFirstConflict && (CheckResolved()>=0))
830832 {
831833 pwndActiveView->GoToFirstConflict();
Show on old repository browser