More changes to use #ifndef PRODUCT ... #endif explicitly instead of relying on compiler magic.

runtime/vm/metrics.cc

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/metrics.h"
 
 #include "vm/isolate.h"
 #include "vm/json_stream.h"
 #include "vm/native_entry.h"
 #include "vm/runtime_entry.h"
@@ skipping 49 matching lines @@
   if (name_ != NULL) {
     if (isolate_ == NULL) {
       DeregisterWithVM();
     } else {
       DeregisterWithIsolate();
     }
   }
 }
 
 
+#ifndef PRODUCT
 static const char* UnitString(intptr_t unit) {
   switch (unit) {
     case Metric::kCounter: return "counter";
     case Metric::kByte: return "byte";
     default:
       UNREACHABLE();
   }
   UNREACHABLE();
   return NULL;
 }
@@ skipping 10 matching lines @@
   obj.AddProperty("unit", UnitString(unit()));
   if (isolate_ == NULL) {
     obj.AddFixedServiceId("vm/metrics/%s", name_);
   } else {
     obj.AddFixedServiceId("metrics/native/%s", name_);
   }
   // TODO(johnmccutchan): Overflow?
   double value_as_double = static_cast<double>(Value());
   obj.AddProperty("value", value_as_double);
 }
+#endif  // !PRODUCT
 
 
 char* Metric::ValueToString(int64_t value, Unit unit) {
   Thread* thread = Thread::Current();
   ASSERT(thread != NULL);
   Zone* zone = thread->zone();
   ASSERT(zone != NULL);
   switch (unit) {
     case kCounter:
       return zone->PrintToString("%" Pd64 "", value);
@@ skipping 226 matching lines @@
 }
 
 
 void MinMetric::SetValue(int64_t new_value) {
   if (new_value < value()) {
     set_value(new_value);
   }
 }
 
 }  // namespace dart