Some changes necessary to build an optimized binary on Linux.

Two other speedup changes that I'm not including:
 root_env = Environment(
     tools = ['component_setup'],
+    RPATH=[],

And
 linux_env.Tool('target_platform_linux')
-linux_env.Tool('target_debug')
+linux_env.Tool('target_optimized')

Review URL: http://codereview.chromium.org/10292


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5193 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 4 deletions

diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc
index 20e6348..75af4e4 100644
--- a/net/disk_cache/backend_impl.cc
+++ b/net/disk_cache/backend_impl.cc
@@ -340,12 +340,15 @@ bool BackendImpl::DoomEntry(const std::string& key) {
   if (disabled_)
     return false;
 
-  EntryImpl* entry;
-  if (!OpenEntry(key, reinterpret_cast<Entry**>(&entry)))
+  Entry* entry;
+  if (!OpenEntry(key, &entry))
     return false;
 
-  entry->Doom();
-  entry->Release();
+  // Note that you'd think you could just pass &entry_impl to OpenEntry,
+  // but that triggers strict aliasing problems with gcc.
+  EntryImpl* entry_impl = reinterpret_cast<EntryImpl*>(entry);
+  entry_impl->Doom();
+  entry_impl->Release();
   return true;
 }