From c68ce1701346721ff143dea771b1f3f6482ef1a0 Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Thu, 24 Nov 2011 22:30:27 +0000 Subject: Remove 4 static initializers. Most of them caused by gcc 4.4 being not sufficiently smart. BUG=94925 TEST=none TBR=akalin Review URL: http://codereview.chromium.org/8690005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111560 0039d316-1c4b-4281-b951-d872f2087c98 --- sql/connection.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sql') diff --git a/sql/connection.cc b/sql/connection.cc index bda1d26..f7fef12 100644 --- a/sql/connection.cc +++ b/sql/connection.cc @@ -19,7 +19,7 @@ namespace { // Spin for up to a second waiting for the lock to clear when setting // up the database. // TODO(shess): Better story on this. http://crbug.com/56559 -const base::TimeDelta kBusyTimeout = base::TimeDelta::FromSeconds(1); +const int kBusyTimeoutSeconds = 1; class ScopedBusyTimeout { public: @@ -373,6 +373,9 @@ bool Connection::OpenInternal(const std::string& file_name) { NOTREACHED() << "Could not set locking mode: " << GetErrorMessage(); } + const base::TimeDelta kBusyTimeout = + base::TimeDelta::FromSeconds(kBusyTimeoutSeconds); + if (page_size_ != 0) { // Enforce SQLite restrictions on |page_size_|. DCHECK(!(page_size_ & (page_size_ - 1))) -- cgit v1.1