projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
v8
/
src
/
allocation.cc
diff --git
a/src/v8/src/allocation.cc
b/src/v8/src/allocation.cc
index
98c9be2
..
b5aa984
100644
(file)
--- a/
src/v8/src/allocation.cc
+++ b/
src/v8/src/allocation.cc
@@
-5,8
+5,8
@@
#include "src/allocation.h"
#include <stdlib.h> // For free, malloc.
#include "src/allocation.h"
#include <stdlib.h> // For free, malloc.
-#include "src/
checks
.h"
-#include "src/platform.h"
+#include "src/
base/logging
.h"
+#include "src/
base/platform/
platform.h"
#include "src/utils.h"
#if V8_LIBC_BIONIC
#include "src/utils.h"
#if V8_LIBC_BIONIC
@@
-83,7
+83,7
@@
char* StrNDup(const char* str, int n) {
void* AlignedAlloc(size_t size, size_t alignment) {
void* AlignedAlloc(size_t size, size_t alignment) {
-
ASSERT
(IsPowerOf2(alignment) && alignment >= V8_ALIGNOF(void*)); // NOLINT
+
DCHECK
(IsPowerOf2(alignment) && alignment >= V8_ALIGNOF(void*)); // NOLINT
void* ptr;
#if V8_OS_WIN
ptr = _aligned_malloc(size, alignment);
void* ptr;
#if V8_OS_WIN
ptr = _aligned_malloc(size, alignment);