diff options
| author | avi <avi@chromium.org> | 2015-12-24 00:44:47 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-24 08:46:03 +0000 |
| commit | 9beac25f9447dd40cc132df1160feb91822181b8 (patch) | |
| tree | bc08be2127f36469847a532c0e3500c1b0febbde /base/memory/singleton_unittest.cc | |
| parent | ebe805c971bd41b5666c52adfc83ceabb5bde0ed (diff) | |
| download | chromium_src-9beac25f9447dd40cc132df1160feb91822181b8.zip chromium_src-9beac25f9447dd40cc132df1160feb91822181b8.tar.gz chromium_src-9beac25f9447dd40cc132df1160feb91822181b8.tar.bz2 | |
Switch to standard integer types in base/memory/.
BUG=138542
TBR=mark@chromium.org
Review URL: https://codereview.chromium.org/1549003002
Cr-Commit-Position: refs/heads/master@{#366816}
Diffstat (limited to 'base/memory/singleton_unittest.cc')
| -rw-r--r-- | base/memory/singleton_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/base/memory/singleton_unittest.cc b/base/memory/singleton_unittest.cc index 28daf10..a15145c 100644 --- a/base/memory/singleton_unittest.cc +++ b/base/memory/singleton_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stdint.h> + #include "base/at_exit.h" #include "base/memory/singleton.h" #include "testing/gtest/include/gtest/gtest.h" @@ -272,8 +274,8 @@ TEST_F(SingletonTest, Alignment) { // Create some static singletons with increasing sizes and alignment // requirements. By ordering this way, the linker will need to do some work to // ensure proper alignment of the static data. - AlignedTestSingleton<int32>* align4 = - AlignedTestSingleton<int32>::GetInstance(); + AlignedTestSingleton<int32_t>* align4 = + AlignedTestSingleton<int32_t>::GetInstance(); AlignedTestSingleton<AlignedMemory<32, 32> >* align32 = AlignedTestSingleton<AlignedMemory<32, 32> >::GetInstance(); AlignedTestSingleton<AlignedMemory<128, 128> >* align128 = |