Bug 764616: Fix constructor out-of-order constructor init-list in Gecko profiler, to silence build warning. r=benwa
authorDaniel Holbert <dholbert@cs.stanford.edu>
Wed, 13 Jun 2012 16:24:48 -0700
changeset 96621 669274e1fcf7ab9ca9cfde9ea7fa7ea28f61c348
parent 96620 ff605042a4dc72bec2364782ff0c720030a3240d
child 96622 6d05ace9ed4fdad9d5b5901fd2d295c351caf104
push id10641
push userdholbert@mozilla.com
push dateWed, 13 Jun 2012 23:25:15 +0000
treeherdermozilla-inbound@669274e1fcf7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbenwa
bugs764616
milestone16.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 764616: Fix constructor out-of-order constructor init-list in Gecko profiler, to silence build warning. r=benwa
tools/profiler/platform-linux.cc
tools/profiler/platform-macos.cc
tools/profiler/platform-win32.cc
--- a/tools/profiler/platform-linux.cc
+++ b/tools/profiler/platform-linux.cc
@@ -177,18 +177,18 @@ static void* SenderEntry(void* arg) {
   data->SignalSender();
   return 0;
 }
 
 
 Sampler::Sampler(int interval, bool profiling)
     : interval_(interval),
       profiling_(profiling),
-      active_(false),
-      paused_(false) {
+      paused_(false),
+      active_(false) {
   data_ = new PlatformData(this);
 }
 
 Sampler::~Sampler() {
   ASSERT(!data_->signal_sender_launched_);
   delete data_;
 }
 
--- a/tools/profiler/platform-macos.cc
+++ b/tools/profiler/platform-macos.cc
@@ -291,18 +291,18 @@ class SamplerThread : public Thread {
 Mutex* SamplerThread::mutex_ = OS::CreateMutex();
 SamplerThread* SamplerThread::instance_ = NULL;
 
 
 Sampler::Sampler(int interval, bool profiling)
     : // isolate_(isolate),
       interval_(interval),
       profiling_(profiling),
-      active_(false),
-      paused_(false) /*,
+      paused_(false),
+      active_(false) /*,
       samples_taken_(0)*/ {
   data_ = new PlatformData;
 }
 
 
 Sampler::~Sampler() {
   ASSERT(!IsActive());
   delete data_;
--- a/tools/profiler/platform-win32.cc
+++ b/tools/profiler/platform-win32.cc
@@ -116,18 +116,18 @@ class SamplerThread : public Thread {
 };
 
 SamplerThread* SamplerThread::instance_ = NULL;
 
 
 Sampler::Sampler(int interval, bool profiling)
     : interval_(interval),
       profiling_(profiling),
+      paused_(false),
       active_(false),
-      paused_(false),
       data_(new PlatformData) {
 }
 
 Sampler::~Sampler() {
   ASSERT(!IsActive());
   delete data_;
 }