Bug 620375 - Wrongly ordered members in History::History() constructor; r+a=sdwilsh
authorMs2ger <ms2ger@gmail.com>
Tue, 21 Dec 2010 15:03:01 -0800
changeset 59580 438d6a2f3a9ccc09c6c02a2e872d6b72454f5600
parent 59579 0257a5a7419adac83e1b99b3220bbad563e528a7
child 59581 52b229f6a051f989ad6fced46c44ef1bbfe0b938
push id17673
push userdholbert@mozilla.com
push dateTue, 21 Dec 2010 23:04:38 +0000
treeherdermozilla-central@52b229f6a051 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs620375
milestone2.0b9pre
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 620375 - Wrongly ordered members in History::History() constructor; r+a=sdwilsh
toolkit/components/places/src/History.cpp
--- a/toolkit/components/places/src/History.cpp
+++ b/toolkit/components/places/src/History.cpp
@@ -838,23 +838,23 @@ private:
 } // anonymous namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //// History
 
 History* History::gService = NULL;
 
 History::History()
-: mShuttingDown(false)
-, syncStatements(mDBConn)
+  : syncStatements(mDBConn)
+  , mShuttingDown(false)
 {
   NS_ASSERTION(!gService, "Ruh-roh!  This service has already been created!");
   gService = this;
 
-  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
+  nsCOMPtr<nsIObserverService> os = services::GetObserverService();
   NS_WARN_IF_FALSE(os, "Observer service was not found!");
   if (os) {
     (void)os->AddObserver(this, TOPIC_PLACES_SHUTDOWN, PR_FALSE);
   }
 }
 
 History::~History()
 {