diff options
| author | james.wei@intel.com <james.wei@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-30 12:34:56 +0000 |
|---|---|---|
| committer | james.wei@intel.com <james.wei@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-30 12:34:56 +0000 |
| commit | 862a3f5bc3c19dd1091eaa592e4a22ab15618964 (patch) | |
| tree | 6269e9413e60dda7dde1cd2585c39d65e6568a7b /base/containers | |
| parent | 1ee4176200810f7f620f0683b43968da414709ab (diff) | |
| download | chromium_src-862a3f5bc3c19dd1091eaa592e4a22ab15618964.zip chromium_src-862a3f5bc3c19dd1091eaa592e4a22ab15618964.tar.gz chromium_src-862a3f5bc3c19dd1091eaa592e4a22ab15618964.tar.bz2 | |
Fix BufferAlignment build issue for Android x86
This issue is related to https://chromiumcodereview.appspot.com/12025021
On Android x86, the alignment could be 256 bytes.
BUG=
Review URL: https://chromiumcodereview.appspot.com/12095031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/containers')
| -rw-r--r-- | base/containers/stack_container.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/containers/stack_container.h b/base/containers/stack_container.h index b3e508b..347c6b3 100644 --- a/base/containers/stack_container.h +++ b/base/containers/stack_container.h @@ -56,7 +56,7 @@ class StackAllocator : public std::allocator<T> { // constructors and destructors to be automatically called. Define a POD // buffer of the right size instead. base::AlignedMemory<sizeof(T[stack_capacity]), ALIGNOF(T)> stack_buffer_; -#if defined(OS_ANDROID) +#if defined(__GNUC__) && !defined(ARCH_CPU_X86_FAMILY) COMPILE_ASSERT(ALIGNOF(T) <= 16, crbug_115612); #endif |