diff options
| -rw-r--r-- | BUILD.gn | 4 | ||||
| -rw-r--r-- | core/fxcrt/fx_memory.cpp (renamed from core/fxcrt/fx_basic_memmgr.cpp) | 4 | ||||
| -rw-r--r-- | core/fxcrt/fx_memory_unittest.cpp (renamed from core/fxcrt/fx_basic_memmgr_unittest.cpp) | 3 |
3 files changed, 6 insertions, 5 deletions
@@ -767,7 +767,6 @@ static_library("fxcrt") { "core/fxcrt/fx_basic.h", "core/fxcrt/fx_basic_buffer.cpp", "core/fxcrt/fx_basic_gcc.cpp", - "core/fxcrt/fx_basic_memmgr.cpp", "core/fxcrt/fx_basic_utf.cpp", "core/fxcrt/fx_basic_util.cpp", "core/fxcrt/fx_bidi.cpp", @@ -777,6 +776,7 @@ static_library("fxcrt") { "core/fxcrt/fx_coordinates.h", "core/fxcrt/fx_extension.cpp", "core/fxcrt/fx_extension.h", + "core/fxcrt/fx_memory.cpp", "core/fxcrt/fx_memory.h", "core/fxcrt/fx_safe_types.h", "core/fxcrt/fx_stream.cpp", @@ -1870,10 +1870,10 @@ test("pdfium_unittests") { "core/fxcrt/cfx_weak_ptr_unittest.cpp", "core/fxcrt/cfx_widestring_unittest.cpp", "core/fxcrt/fx_basic_gcc_unittest.cpp", - "core/fxcrt/fx_basic_memmgr_unittest.cpp", "core/fxcrt/fx_basic_util_unittest.cpp", "core/fxcrt/fx_bidi_unittest.cpp", "core/fxcrt/fx_extension_unittest.cpp", + "core/fxcrt/fx_memory_unittest.cpp", "core/fxcrt/fx_system_unittest.cpp", "core/fxge/dib/cstretchengine_unittest.cpp", "fpdfsdk/fpdfdoc_unittest.cpp", diff --git a/core/fxcrt/fx_basic_memmgr.cpp b/core/fxcrt/fx_memory.cpp index 75bc2bc1f1..2807139aa2 100644 --- a/core/fxcrt/fx_basic_memmgr.cpp +++ b/core/fxcrt/fx_memory.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include <stdlib.h> // For abort(). - #include "core/fxcrt/fx_memory.h" +#include <stdlib.h> // For abort(). + pdfium::base::PartitionAllocatorGeneric gArrayBufferPartitionAllocator; pdfium::base::PartitionAllocatorGeneric gStringPartitionAllocator; diff --git a/core/fxcrt/fx_basic_memmgr_unittest.cpp b/core/fxcrt/fx_memory_unittest.cpp index fdffd98f19..ae15db2a72 100644 --- a/core/fxcrt/fx_basic_memmgr_unittest.cpp +++ b/core/fxcrt/fx_memory_unittest.cpp @@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "core/fxcrt/fx_memory.h" + #include <limits> -#include "core/fxcrt/fx_memory.h" #include "testing/gtest/include/gtest/gtest.h" namespace { |