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

test/cctest/test-lockers.cc

 // Copyright 2007-2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 49 matching lines @@
  public:
   KangarooThread(v8::Isolate* isolate, v8::Handle<v8::Context> context)
       : Thread(Options("KangarooThread")),
         isolate_(isolate),
         context_(isolate, context) {}
 
   void Run() {
     {
       v8::Locker locker(isolate_);
       v8::Isolate::Scope isolate_scope(isolate_);
-      CHECK_EQ(reinterpret_cast<v8::internal::Isolate*>(isolate_),
-               v8::internal::Isolate::Current());
+      CHECK_EQ(isolate_, v8::internal::Isolate::Current());
       v8::HandleScope scope(isolate_);
       v8::Local<v8::Context> context =
           v8::Local<v8::Context>::New(isolate_, context_);
       v8::Context::Scope context_scope(context);
       Local<Value> v = CompileRun("getValue()");
       CHECK(v->IsNumber());
       CHECK_EQ(30, static_cast<int>(v->NumberValue()));
     }
     {
       v8::Locker locker(isolate_);
@@ skipping 18 matching lines @@
 // Migrates an isolate from one thread to another
 TEST(KangarooIsolates) {
   v8::Isolate* isolate = v8::Isolate::New();
   i::SmartPointer<KangarooThread> thread1;
   {
     v8::Locker locker(isolate);
     v8::Isolate::Scope isolate_scope(isolate);
     v8::HandleScope handle_scope(isolate);
     v8::Local<v8::Context> context = v8::Context::New(isolate);
     v8::Context::Scope context_scope(context);
-    CHECK_EQ(reinterpret_cast<v8::internal::Isolate*>(isolate),
-             v8::internal::Isolate::Current());
+    CHECK_EQ(isolate, v8::internal::Isolate::Current());
     CompileRun("function getValue() { return 30; }");
     thread1.Reset(new KangarooThread(isolate, context));
   }
   thread1->Start();
   thread1->Join();
 }
 
 
 static void CalcFibAndCheck() {
   Local<Value> v = CompileRun("function fib(n) {"
@@ skipping 57 matching lines @@
   explicit IsolateLockingThreadWithLocalContext(v8::Isolate* isolate)
     : JoinableThread("IsolateLockingThread"),
       isolate_(isolate) {
   }
 
   virtual void Run() {
     v8::Locker locker(isolate_);
     v8::Isolate::Scope isolate_scope(isolate_);
     v8::HandleScope handle_scope(isolate_);
     LocalContext local_context(isolate_);
-    CHECK_EQ(reinterpret_cast<v8::internal::Isolate*>(isolate_),
-             v8::internal::Isolate::Current());
+    CHECK_EQ(isolate_, v8::internal::Isolate::Current());
     CalcFibAndCheck();
   }
  private:
   v8::Isolate* isolate_;
 };
 
 
 static void StartJoinAndDeleteThreads(const i::List<JoinableThread*>& threads) {
   for (int i = 0; i < threads.length(); i++) {
     threads[i]->Start();
@@ skipping 502 matching lines @@
                                           kSimpleExtensionSource));
   const char* extension_names[] = { "test0", "test1",
                                     "test2", "test3", "test4",
                                     "test5", "test6", "test7" };
   i::List<JoinableThread*> threads(kNThreads);
   for (int i = 0; i < kNThreads; i++) {
     threads.Add(new IsolateGenesisThread(8, extension_names));
   }
   StartJoinAndDeleteThreads(threads);
 }