summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/debug/asan_invalid_access.cc9
-rw-r--r--base/debug/crash_logging.h4
-rw-r--r--base/debug/crash_logging_unittest.cc3
-rw-r--r--base/debug/debugger.cc1
-rw-r--r--base/debug/debugger_posix.cc3
-rw-r--r--base/debug/gdi_debug_util_win.cc1
-rw-r--r--base/debug/leak_annotations.h2
-rw-r--r--base/debug/leak_tracker.h2
-rw-r--r--base/debug/proc_maps_linux.cc14
-rw-r--r--base/debug/proc_maps_linux.h5
-rw-r--r--base/debug/proc_maps_linux_unittest.cc7
-rw-r--r--base/debug/profiler.cc1
-rw-r--r--base/debug/profiler.h3
-rw-r--r--base/debug/stack_trace.cc4
-rw-r--r--base/debug/stack_trace.h2
-rw-r--r--base/debug/stack_trace_android.cc1
-rw-r--r--base/debug/stack_trace_posix.cc4
-rw-r--r--base/debug/stack_trace_unittest.cc3
-rw-r--r--base/debug/stack_trace_win.cc3
-rw-r--r--base/debug/task_annotator.cc7
-rw-r--r--base/debug/task_annotator.h6
21 files changed, 60 insertions, 25 deletions
diff --git a/base/debug/asan_invalid_access.cc b/base/debug/asan_invalid_access.cc
index cee2106..0abde8c 100644
--- a/base/debug/asan_invalid_access.cc
+++ b/base/debug/asan_invalid_access.cc
@@ -2,14 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#if defined(OS_WIN)
-#include <windows.h>
-#endif
+#include <stddef.h>
#include "base/debug/alias.h"
#include "base/debug/asan_invalid_access.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
+#include "build/build_config.h"
+
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
namespace base {
namespace debug {
diff --git a/base/debug/crash_logging.h b/base/debug/crash_logging.h
index 90e6687..7a6bbcd 100644
--- a/base/debug/crash_logging.h
+++ b/base/debug/crash_logging.h
@@ -5,11 +5,13 @@
#ifndef BASE_DEBUG_CRASH_LOGGING_H_
#define BASE_DEBUG_CRASH_LOGGING_H_
+#include <stddef.h>
+
#include <string>
#include <vector>
#include "base/base_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "base/strings/string_piece.h"
// These functions add metadata to the upload payload when sending crash reports
diff --git a/base/debug/crash_logging_unittest.cc b/base/debug/crash_logging_unittest.cc
index 4cd9f3e..5197c03 100644
--- a/base/debug/crash_logging_unittest.cc
+++ b/base/debug/crash_logging_unittest.cc
@@ -4,10 +4,13 @@
#include "base/debug/crash_logging.h"
+#include <stddef.h>
+
#include <map>
#include <string>
#include "base/bind.h"
+#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/base/debug/debugger.cc b/base/debug/debugger.cc
index 79233c5..1ccee1c 100644
--- a/base/debug/debugger.cc
+++ b/base/debug/debugger.cc
@@ -5,6 +5,7 @@
#include "base/debug/debugger.h"
#include "base/logging.h"
#include "base/threading/platform_thread.h"
+#include "build/build_config.h"
namespace base {
namespace debug {
diff --git a/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc
index a2e804f..cd6dc76 100644
--- a/base/debug/debugger_posix.cc
+++ b/base/debug/debugger_posix.cc
@@ -3,10 +3,12 @@
// found in the LICENSE file.
#include "base/debug/debugger.h"
+#include "base/macros.h"
#include "build/build_config.h"
#include <errno.h>
#include <fcntl.h>
+#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/param.h>
@@ -34,7 +36,6 @@
#include <ostream>
-#include "base/basictypes.h"
#include "base/debug/alias.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
diff --git a/base/debug/gdi_debug_util_win.cc b/base/debug/gdi_debug_util_win.cc
index 2db10d1..ce33955 100644
--- a/base/debug/gdi_debug_util_win.cc
+++ b/base/debug/gdi_debug_util_win.cc
@@ -6,6 +6,7 @@
#include <cmath>
#include <psapi.h>
+#include <stddef.h>
#include <TlHelp32.h>
#include "base/debug/alias.h"
diff --git a/base/debug/leak_annotations.h b/base/debug/leak_annotations.h
index ef37959..dc50246 100644
--- a/base/debug/leak_annotations.h
+++ b/base/debug/leak_annotations.h
@@ -5,7 +5,7 @@
#ifndef BASE_DEBUG_LEAK_ANNOTATIONS_H_
#define BASE_DEBUG_LEAK_ANNOTATIONS_H_
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "build/build_config.h"
// This file defines macros which can be used to annotate intentional memory
diff --git a/base/debug/leak_tracker.h b/base/debug/leak_tracker.h
index 8c5aaf3..9dd1622 100644
--- a/base/debug/leak_tracker.h
+++ b/base/debug/leak_tracker.h
@@ -5,6 +5,8 @@
#ifndef BASE_DEBUG_LEAK_TRACKER_H_
#define BASE_DEBUG_LEAK_TRACKER_H_
+#include <stddef.h>
+
#include "build/build_config.h"
// Only enable leak tracking in non-uClibc debug builds.
diff --git a/base/debug/proc_maps_linux.cc b/base/debug/proc_maps_linux.cc
index 8c8965b..0bb44b4 100644
--- a/base/debug/proc_maps_linux.cc
+++ b/base/debug/proc_maps_linux.cc
@@ -5,14 +5,16 @@
#include "base/debug/proc_maps_linux.h"
#include <fcntl.h>
-
-#if defined(OS_LINUX) || defined(OS_ANDROID)
-#include <inttypes.h>
-#endif
+#include <stddef.h>
#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
#include "base/strings/string_split.h"
+#include "build/build_config.h"
+
+#if defined(OS_LINUX) || defined(OS_ANDROID)
+#include <inttypes.h>
+#endif
#if defined(OS_ANDROID) && !defined(__LP64__)
// In 32-bit mode, Bionic's inttypes.h defines PRI/SCNxPTR as an
@@ -112,8 +114,8 @@ bool ParseProcMaps(const std::string& input,
MappedMemoryRegion region;
const char* line = lines[i].c_str();
char permissions[5] = {'\0'}; // Ensure NUL-terminated string.
- uint8 dev_major = 0;
- uint8 dev_minor = 0;
+ uint8_t dev_major = 0;
+ uint8_t dev_minor = 0;
long inode = 0;
int path_index = 0;
diff --git a/base/debug/proc_maps_linux.h b/base/debug/proc_maps_linux.h
index 9fbd478..38e9231 100644
--- a/base/debug/proc_maps_linux.h
+++ b/base/debug/proc_maps_linux.h
@@ -5,11 +5,12 @@
#ifndef BASE_DEBUG_PROC_MAPS_LINUX_H_
#define BASE_DEBUG_PROC_MAPS_LINUX_H_
+#include <stdint.h>
+
#include <string>
#include <vector>
#include "base/base_export.h"
-#include "base/basictypes.h"
namespace base {
namespace debug {
@@ -31,7 +32,7 @@ struct MappedMemoryRegion {
unsigned long long offset;
// Bitmask of read/write/execute/private/shared permissions.
- uint8 permissions;
+ uint8_t permissions;
// Name of the file mapped into memory.
//
diff --git a/base/debug/proc_maps_linux_unittest.cc b/base/debug/proc_maps_linux_unittest.cc
index cbc0dd0..2e35ca6 100644
--- a/base/debug/proc_maps_linux_unittest.cc
+++ b/base/debug/proc_maps_linux_unittest.cc
@@ -2,12 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <stddef.h>
+#include <stdint.h>
+
#include "base/debug/proc_maps_linux.h"
#include "base/files/file_path.h"
+#include "base/macros.h"
#include "base/path_service.h"
#include "base/strings/stringprintf.h"
#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
#include "base/threading/platform_thread.h"
+#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
@@ -142,7 +147,7 @@ TEST(ProcMapsTest, Multiple) {
TEST(ProcMapsTest, Permissions) {
static struct {
const char* input;
- uint8 permissions;
+ uint8_t permissions;
} kTestCases[] = {
{"00400000-0040b000 ---s 00000000 fc:00 794418 /bin/cat\n", 0},
{"00400000-0040b000 ---S 00000000 fc:00 794418 /bin/cat\n", 0},
diff --git a/base/debug/profiler.cc b/base/debug/profiler.cc
index b499c14..75e9aac 100644
--- a/base/debug/profiler.cc
+++ b/base/debug/profiler.cc
@@ -10,6 +10,7 @@
#include "base/process/process_handle.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
+#include "build/build_config.h"
#if defined(OS_WIN)
#include "base/win/pe_image.h"
diff --git a/base/debug/profiler.h b/base/debug/profiler.h
index 2920d8a..7cce7b0 100644
--- a/base/debug/profiler.h
+++ b/base/debug/profiler.h
@@ -5,10 +5,11 @@
#ifndef BASE_DEBUG_PROFILER_H_
#define BASE_DEBUG_PROFILER_H_
+#include <stddef.h>
+
#include <string>
#include "base/base_export.h"
-#include "base/basictypes.h"
// The Profiler functions allow usage of the underlying sampling based
// profiler. If the application has not been built with the necessary
diff --git a/base/debug/stack_trace.cc b/base/debug/stack_trace.cc
index ce9e9ad..2250c8f 100644
--- a/base/debug/stack_trace.cc
+++ b/base/debug/stack_trace.cc
@@ -4,13 +4,13 @@
#include "base/debug/stack_trace.h"
-#include "base/basictypes.h"
-
#include <string.h>
#include <algorithm>
#include <sstream>
+#include "base/macros.h"
+
namespace base {
namespace debug {
diff --git a/base/debug/stack_trace.h b/base/debug/stack_trace.h
index d35468f..07e119a 100644
--- a/base/debug/stack_trace.h
+++ b/base/debug/stack_trace.h
@@ -5,6 +5,8 @@
#ifndef BASE_DEBUG_STACK_TRACE_H_
#define BASE_DEBUG_STACK_TRACE_H_
+#include <stddef.h>
+
#include <iosfwd>
#include <string>
diff --git a/base/debug/stack_trace_android.cc b/base/debug/stack_trace_android.cc
index 5168b18..1e80385 100644
--- a/base/debug/stack_trace_android.cc
+++ b/base/debug/stack_trace_android.cc
@@ -5,6 +5,7 @@
#include "base/debug/stack_trace.h"
#include <android/log.h>
+#include <stddef.h>
#include <unwind.h>
#include <ostream>
diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc
index c49a762..00ee657 100644
--- a/base/debug/stack_trace_posix.cc
+++ b/base/debug/stack_trace_posix.cc
@@ -7,6 +7,8 @@
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
+#include <stddef.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/param.h>
@@ -30,10 +32,10 @@
#include <AvailabilityMacros.h>
#endif
-#include "base/basictypes.h"
#include "base/debug/debugger.h"
#include "base/debug/proc_maps_linux.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "base/numerics/safe_conversions.h"
diff --git a/base/debug/stack_trace_unittest.cc b/base/debug/stack_trace_unittest.cc
index 804587e..9abedba 100644
--- a/base/debug/stack_trace_unittest.cc
+++ b/base/debug/stack_trace_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 <stddef.h>
+
#include <limits>
#include <sstream>
#include <string>
@@ -11,6 +13,7 @@
#include "base/process/kill.h"
#include "base/process/process_handle.h"
#include "base/test/test_timeouts.h"
+#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/multiprocess_func_list.h"
diff --git a/base/debug/stack_trace_win.cc b/base/debug/stack_trace_win.cc
index 2679077..0596752 100644
--- a/base/debug/stack_trace_win.cc
+++ b/base/debug/stack_trace_win.cc
@@ -6,11 +6,12 @@
#include <windows.h>
#include <dbghelp.h>
+#include <stddef.h>
#include <iostream>
-#include "base/basictypes.h"
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/singleton.h"
#include "base/process/launch.h"
#include "base/strings/string_util.h"
diff --git a/base/debug/task_annotator.cc b/base/debug/task_annotator.cc
index e47a043..4ba4d91 100644
--- a/base/debug/task_annotator.cc
+++ b/base/debug/task_annotator.cc
@@ -55,9 +55,10 @@ void TaskAnnotator::RunTask(const char* queue_function,
pending_task, stopwatch);
}
-uint64 TaskAnnotator::GetTaskTraceID(const PendingTask& task) const {
- return (static_cast<uint64>(task.sequence_num) << 32) |
- ((static_cast<uint64>(reinterpret_cast<intptr_t>(this)) << 32) >> 32);
+uint64_t TaskAnnotator::GetTaskTraceID(const PendingTask& task) const {
+ return (static_cast<uint64_t>(task.sequence_num) << 32) |
+ ((static_cast<uint64_t>(reinterpret_cast<intptr_t>(this)) << 32) >>
+ 32);
}
} // namespace debug
diff --git a/base/debug/task_annotator.h b/base/debug/task_annotator.h
index b5cf6c2..443c71b 100644
--- a/base/debug/task_annotator.h
+++ b/base/debug/task_annotator.h
@@ -5,8 +5,10 @@
#ifndef BASE_DEBUG_TASK_ANNOTATOR_H_
#define BASE_DEBUG_TASK_ANNOTATOR_H_
+#include <stdint.h>
+
#include "base/base_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
namespace base {
struct PendingTask;
@@ -32,7 +34,7 @@ class BASE_EXPORT TaskAnnotator {
// Creates a process-wide unique ID to represent this task in trace events.
// This will be mangled with a Process ID hash to reduce the likelyhood of
// colliding with TaskAnnotator pointers on other processes.
- uint64 GetTaskTraceID(const PendingTask& task) const;
+ uint64_t GetTaskTraceID(const PendingTask& task) const;
DISALLOW_COPY_AND_ASSIGN(TaskAnnotator);
};
generated by cgit v1.1 at 2025-01-18 19:03:27 +0000