commit acffcfbe9f9debd88b36e79bddcc0bd1dbd1a2cf
author ulan@chromium.org <ulan@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00> Mon Feb 20 14:07:03 2012
committer ulan@chromium.org <ulan@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00> Mon Feb 20 14:07:03 2012
tree af2ac2d158f604c48a1600d1f1e372b5f1a4eb37
parent af201c7b3b00fb04956e587519eaf02a7ca28092

Merge r10752 into 3.6 branch: Fix compile error on windows.

R=yangguo@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9355041/

git-svn-id: http://v8.googlecode.com/svn/branches/3.6@10761 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/objects.h

diff --git a/src/objects.h b/src/objects.h
index 3b12afb..672cff7 100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -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:

src/version.cc

diff --git a/src/version.cc b/src/version.cc
index 32a5356..250e8b4 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