summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwfh <wfh@chromium.org>2015-01-17 22:54:30 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-18 06:55:21 +0000
commitb712af8a5f27641efdb337e58390ceefe4cd07de (patch)
tree839f9f29751676ece6318ff1f46e6bc31a1f7d09
parente58d007d382500a81754ada13c53b1dfe7feab21 (diff)
downloadchromium_src-b712af8a5f27641efdb337e58390ceefe4cd07de.zip
chromium_src-b712af8a5f27641efdb337e58390ceefe4cd07de.tar.gz
chromium_src-b712af8a5f27641efdb337e58390ceefe4cd07de.tar.bz2
clang/win: Fix a few warnings/errors.
Add throw() declarations to fix clang compile errors and match the declarations in the MS SDK. This is a followup to https://codereview.chromium.org/447513002 Also, cfree is deprecated and certainly isn't available on Windows, so removing the code. BUG=82385 Review URL: https://codereview.chromium.org/827013006 Cr-Commit-Position: refs/heads/master@{#312048}
-rw-r--r--base/allocator/generic_allocators.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/base/allocator/generic_allocators.cc b/base/allocator/generic_allocators.cc
index 2726903..ae65f77 100644
--- a/base/allocator/generic_allocators.cc
+++ b/base/allocator/generic_allocators.cc
@@ -28,7 +28,7 @@ void* operator new(size_t size) {
return generic_cpp_alloc(size, false);
}
-void operator delete(void* p) {
+void operator delete(void* p) throw() {
free(p);
}
@@ -36,7 +36,7 @@ void* operator new[](size_t size) {
return generic_cpp_alloc(size, false);
}
-void operator delete[](void* p) {
+void operator delete[](void* p) throw() {
free(p);
}
@@ -44,7 +44,7 @@ void* operator new(size_t size, const std::nothrow_t& nt) {
return generic_cpp_alloc(size, true);
}
-void operator delete(void* p, const std::nothrow_t& nt) {
+void operator delete(void* p, const std::nothrow_t& nt) throw() {
free(p);
}
@@ -52,7 +52,7 @@ void* operator new[](size_t size, const std::nothrow_t& nt) {
return generic_cpp_alloc(size, true);
}
-void operator delete[](void* p, const std::nothrow_t& nt) {
+void operator delete[](void* p, const std::nothrow_t& nt) throw() {
free(p);
}
@@ -83,10 +83,6 @@ void* calloc(size_t n, size_t elem_size) {
return result;
}
-void cfree(void* p) {
- free(p);
-}
-
#ifdef WIN32
void* _recalloc(void* p, size_t n, size_t elem_size) {