Revert "Make GCC happy again." and "Initial switch to Chromium-style CHECK_* and DCHECK_* macros.".

src/objects.h

Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index 058f85dd414bd199c19187f3e94a7ebec714fb26..93c39281ca90f728627bf73745089db317868abc 100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -4791,7 +4791,7 @@ template <class Traits>
 class FixedTypedArray: public FixedTypedArrayBase {
  public:
   typedef typename Traits::ElementType ElementType;
-  enum { kInstanceType = Traits::kInstanceType };
+  static const InstanceType kInstanceType = Traits::kInstanceType;
 
   DECLARE_CAST(FixedTypedArray<Traits>)
 
@@ -4823,17 +4823,17 @@ class FixedTypedArray: public FixedTypedArrayBase {
   DISALLOW_IMPLICIT_CONSTRUCTORS(FixedTypedArray);
 };
 
-#define FIXED_TYPED_ARRAY_TRAITS(Type, type, TYPE, elementType, size) \
-  class Type##ArrayTraits {                                           \
-   public: /* NOLINT */                                               \
-    typedef elementType ElementType;                                  \
-    enum { kInstanceType = FIXED_##TYPE##_ARRAY_TYPE };               \
-    static const char* Designator() { return #type " array"; }        \
-    static inline Handle<Object> ToHandle(Isolate* isolate,           \
-                                          elementType scalar);        \
-    static inline elementType defaultValue();                         \
-  };                                                                  \
-                                                                      \
+#define FIXED_TYPED_ARRAY_TRAITS(Type, type, TYPE, elementType, size)         \
+  class Type##ArrayTraits {                                                   \
+   public:   /* NOLINT */                                                     \
+    typedef elementType ElementType;                                          \
+    static const InstanceType kInstanceType = FIXED_##TYPE##_ARRAY_TYPE;      \
+    static const char* Designator() { return #type " array"; }                \
+    static inline Handle<Object> ToHandle(Isolate* isolate,                   \
+                                          elementType scalar);                \
+    static inline elementType defaultValue();                                 \
+  };                                                                          \
+                                                                              \
   typedef FixedTypedArray<Type##ArrayTraits> Fixed##Type##Array;
 
 TYPED_ARRAYS(FIXED_TYPED_ARRAY_TRAITS)