diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 22:30:27 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 22:30:27 +0000 |
| commit | c68ce1701346721ff143dea771b1f3f6482ef1a0 (patch) | |
| tree | 13aa27c42aa767a49a0ce94536f342651a5b3d02 /sql | |
| parent | 173ca873f69c128c933310b962972082bb6068e1 (diff) | |
| download | chromium_src-c68ce1701346721ff143dea771b1f3f6482ef1a0.zip chromium_src-c68ce1701346721ff143dea771b1f3f6482ef1a0.tar.gz chromium_src-c68ce1701346721ff143dea771b1f3f6482ef1a0.tar.bz2 | |
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
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/connection.cc | 5 |
1 files changed, 4 insertions, 1 deletions
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))) |