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

src/ic/ic-state.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_IC_STATE_H_
 #define V8_IC_STATE_H_
 
 #include "src/macro-assembler.h"
 
 namespace v8 {
@@ skipping 105 matching lines @@
   bool HasSideEffects() const {
     return Max(left_kind_, right_kind_) == GENERIC;
   }
 
   // Returns true if the IC should enable the inline smi code (i.e. if either
   // parameter may be a smi).
   bool UseInlinedSmiCode() const {
     return KindMaybeSmi(left_kind_) || KindMaybeSmi(right_kind_);
   }
 
-  enum { FIRST_TOKEN = Token::BIT_OR, LAST_TOKEN = Token::MOD };
+  static const int FIRST_TOKEN = Token::BIT_OR;
+  static const int LAST_TOKEN = Token::MOD;
 
   Token::Value op() const { return op_; }
   OverwriteMode mode() const { return mode_; }
   Maybe<int> fixed_right_arg() const { return fixed_right_arg_; }
 
   Type* GetLeftType(Zone* zone) const { return KindToType(left_kind_, zone); }
   Type* GetRightType(Zone* zone) const { return KindToType(right_kind_, zone); }
   Type* GetResultType(Zone* zone) const;
 
   void Update(Handle<Object> left, Handle<Object> right, Handle<Object> result);
@@ skipping 91 matching lines @@
  private:
   class ContextualModeBits : public BitField<ContextualMode, 0, 1> {};
   STATIC_ASSERT(static_cast<int>(NOT_CONTEXTUAL) == 0);
 
   const ExtraICState state_;
 };
 }
 }
 
 #endif  // V8_IC_STATE_H_