Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(268)

Side by Side Diff: base/memory/aligned_memory.cc

Issue 1549003002: Switch to standard integer types in base/memory/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/memory/aligned_memory.h ('k') | base/memory/aligned_memory_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/aligned_memory.h" 5 #include "base/memory/aligned_memory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "build/build_config.h"
8 9
9 #if defined(OS_ANDROID) 10 #if defined(OS_ANDROID)
10 #include <malloc.h> 11 #include <malloc.h>
11 #endif 12 #endif
12 13
13 namespace base { 14 namespace base {
14 15
15 void* AlignedAlloc(size_t size, size_t alignment) { 16 void* AlignedAlloc(size_t size, size_t alignment) {
16 DCHECK_GT(size, 0U); 17 DCHECK_GT(size, 0U);
17 DCHECK_EQ(alignment & (alignment - 1), 0U); 18 DCHECK_EQ(alignment & (alignment - 1), 0U);
(...skipping 19 matching lines...) Expand all
37 DLOG(ERROR) << "If you crashed here, your aligned allocation is incorrect: " 38 DLOG(ERROR) << "If you crashed here, your aligned allocation is incorrect: "
38 << "size=" << size << ", alignment=" << alignment; 39 << "size=" << size << ", alignment=" << alignment;
39 CHECK(false); 40 CHECK(false);
40 } 41 }
41 // Sanity check alignment just to be safe. 42 // Sanity check alignment just to be safe.
42 DCHECK_EQ(reinterpret_cast<uintptr_t>(ptr) & (alignment - 1), 0U); 43 DCHECK_EQ(reinterpret_cast<uintptr_t>(ptr) & (alignment - 1), 0U);
43 return ptr; 44 return ptr;
44 } 45 }
45 46
46 } // namespace base 47 } // namespace base
OLDNEW
« no previous file with comments | « base/memory/aligned_memory.h ('k') | base/memory/aligned_memory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698