diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 01:12:22 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 01:12:22 +0000 |
| commit | 7f5b892399727380e06d084189795b1dc7669d37 (patch) | |
| tree | e12fe3bb6409afaf1a1e0d330652684b255bfd07 /chrome/browser/history/android | |
| parent | 2c95e24628e8d61bfe77e0d0d6ef1d75b85bfd7c (diff) | |
| download | chromium_src-7f5b892399727380e06d084189795b1dc7669d37.zip chromium_src-7f5b892399727380e06d084189795b1dc7669d37.tar.gz chromium_src-7f5b892399727380e06d084189795b1dc7669d37.tar.bz2 | |
Revert 147988 - Upgrade AlignedMemory to support dynamic allocations.
Adds two new methods: AlignedAlloc and AlignedFree for creating and
destroying dynamic aligned allocations respectively. Also adds a
helper class, ScopedPtrAlignedFree, for use with scoped_ptr_malloc.
AlignedAlloc uses posix_memalign for OS X (now that we're targeting
10.6), Linux and _aligned_alloc() on Windows. Android and NaCl use
memalign() since they do not expose posix_memalign() and memalign()
is safe to use with free() on those platforms.
Also hacks around a bug in Visual C++ where __alignof will sometimes
return zero:
http://connect.microsoft.com/VisualStudio/feedback/details/682695/c-alignof-fails-to-properly-evalute-alignment-of-dependent-types
BUG=none
TEST=base_unittests + new test, trybots.
Review URL: https://chromiumcodereview.appspot.com/10796020
TBR=dalecurtis@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10817021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/android')
| -rw-r--r-- | chrome/browser/history/android/android_urls_sql_handler.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/history/android/android_urls_sql_handler.cc b/chrome/browser/history/android/android_urls_sql_handler.cc index b2bb498..2b2d687 100644 --- a/chrome/browser/history/android/android_urls_sql_handler.cc +++ b/chrome/browser/history/android/android_urls_sql_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/history/android/android_urls_sql_handler.h" -#include "base/logging.h" #include "chrome/browser/history/history_database.h" namespace history { |