Revision: 10761 Author: [email protected] Date: Mon Feb 20 06:07:03 2012 Log: Merge r10752 into 3.6 branch: Fix compile error on windows.
[email protected] Review URL: https://chromiumcodereview.appspot.com/9355041/ http://code.google.com/p/v8/source/detail?r=10761 Modified: /branches/3.6/src/objects.h /branches/3.6/src/version.cc ======================================= --- /branches/3.6/src/objects.h Mon Feb 20 01:36:34 2012 +++ /branches/3.6/src/objects.h Mon Feb 20 06:07:03 2012 @@ -986,7 +986,8 @@ void SmiVerify(); #endif - static const int kMinValue = (-1U << (kSmiValueSize - 1)); + static const int kMinValue = + (static_cast<unsigned int>(-1)) << (kSmiValueSize - 1); static const int kMaxValue = -(kMinValue + 1); private: ======================================= --- /branches/3.6/src/version.cc Mon Feb 20 01:36:34 2012 +++ /branches/3.6/src/version.cc Mon Feb 20 06:07:03 2012 @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 6 #define BUILD_NUMBER 6 -#define PATCH_LEVEL 22 +#define PATCH_LEVEL 23 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
