Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only return -1,0,1 from wxXmlResource::CompareVersion().

Browse Source 
In other words, do as the comment says.  Also fixes an implicit
conversion warning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2013-07-10 16:38:19 +00:00
parent 661698e54f
commit 8778519200
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/xrc/xmlres.h
View File

@@ -261,8 +261,16 @@ public:
// Compares resources version to argument. Returns -1 if resources version // Compares resources version to argument. Returns -1 if resources version
// is less than the argument, +1 if greater and 0 if they equal. // is less than the argument, +1 if greater and 0 if they equal.
int CompareVersion(int major, int minor, int release, int revision) const int CompareVersion(int major, int minor, int release, int revision) const
{ return GetVersion() - {
(major*256*256*256 + minor*256*256 + release*256 + revision); } long diff = GetVersion() -
(major*256*256*256 + minor*256*256 + release*256 + revision);
if ( diff < 0 )
return -1;
else if ( diff > 0 )
return +1;
else
return 0;
}
//// Singleton accessors. //// Singleton accessors.