Reviewers: vogelheim,

Description:
Version 3.29.20.1 (merged r23454)

Fix >> versus > > for stupid C++ compilers.

[email protected]
BUG=

Please review this at https://codereview.chromium.org/484373003/

SVN Base: https://v8.googlecode.com/svn/trunk

Affected files (+10, -9 lines):
  M src/version.cc
  M src/zone-containers.h


Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index b108267aca2be20399ca9793f0c92f3d2771f567..91af761c61482a314b69770eb60e8f98b2195494 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     29
 #define BUILD_NUMBER      20
-#define PATCH_LEVEL       0
+#define PATCH_LEVEL       1
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0
Index: src/zone-containers.h
diff --git a/src/zone-containers.h b/src/zone-containers.h
index f3ac1a8598d5ffea9dc76fb8242ff9c8de694b5b..2ee178029ff8d95c245e02d478d297b09d3f39bb 100644
--- a/src/zone-containers.h
+++ b/src/zone-containers.h
@@ -17,36 +17,37 @@ namespace internal {
 // A wrapper subclass for std::vector to make it easy to construct one
 // that uses a zone allocator.
 template <typename T>
-class ZoneVector : public std::vector<T, zone_allocator<T>> {
+class ZoneVector : public std::vector<T, zone_allocator<T> > {
  public:
   // Constructs an empty vector.
   explicit ZoneVector(Zone* zone)
-      : std::vector<T, zone_allocator<T>>(zone_allocator<T>(zone)) {}
+      : std::vector<T, zone_allocator<T> >(zone_allocator<T>(zone)) {}

   // Constructs a new vector and fills it with {size} elements, each
   // having the value {def}.
   ZoneVector(int size, T def, Zone* zone)
- : std::vector<T, zone_allocator<T>>(size, def, zone_allocator<T>(zone)) {} + : std::vector<T, zone_allocator<T> >(size, def, zone_allocator<T>(zone)) {
+  }
 };

 // A wrapper subclass std::deque to make it easy to construct one
 // that uses a zone allocator.
 template <typename T>
-class ZoneDeque : public std::deque<T, zone_allocator<T>> {
+class ZoneDeque : public std::deque<T, zone_allocator<T> > {
  public:
   explicit ZoneDeque(Zone* zone)
-      : std::deque<T, zone_allocator<T>>(zone_allocator<T>(zone)) {}
+      : std::deque<T, zone_allocator<T> >(zone_allocator<T>(zone)) {}
 };

 // A wrapper subclass for std::queue to make it easy to construct one
 // that uses a zone allocator.
 template <typename T>
-class ZoneQueue : public std::queue<T, std::deque<T, zone_allocator<T>>> {
+class ZoneQueue : public std::queue<T, std::deque<T, zone_allocator<T> > > {
  public:
   // Constructs an empty queue.
   explicit ZoneQueue(Zone* zone)
-      : std::queue<T, std::deque<T, zone_allocator<T>>>(
-            std::deque<T, zone_allocator<T>>(zone_allocator<T>(zone))) {}
+      : std::queue<T, std::deque<T, zone_allocator<T> > >(
+            std::deque<T, zone_allocator<T> >(zone_allocator<T>(zone))) {}
 };

 // Typedefs to shorten commonly used vectors.


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to