Reviewers: Yang,
Message:
PTAQL
Description:
Merge r10752 into 3.6 branch: Fix compile error on windows.
[email protected]
BUG=
TEST=
Please review this at https://chromiumcodereview.appspot.com/9355041/
SVN Base: https://v8.googlecode.com/svn/branches/3.6
Affected files:
M src/objects.h
M src/version.cc
Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index
3b12afbd3c7cd178f7adefdb2ebc8518bceca956..672cff7abba083187f8d83ee52a8baab486859e3
100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -986,7 +986,8 @@ class Smi: public Object {
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:
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
32a53564131645710c06a1a970c2691a4b66efe7..250e8b427c79b838996f554bd74530a993225540
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -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