summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/base.xcodeproj/project.pbxproj2
-rw-r--r--base/build/base.vcproj4
-rw-r--r--base/debug_util_posix.cc2
-rw-r--r--base/file_util_linux.cc1
-rw-r--r--base/logging.cc1
-rw-r--r--base/logging.h34
-rw-r--r--base/notimplemented.h46
-rw-r--r--net/disk_cache/cache_util_posix.cc1
-rw-r--r--net/disk_cache/file_posix.cc2
-rw-r--r--net/disk_cache/os_file_posix.cc2
-rw-r--r--net/disk_cache/trace.cc1
-rw-r--r--net/http/http_network_layer.cc2
-rw-r--r--net/proxy/proxy_service.cc2
13 files changed, 39 insertions, 61 deletions
diff --git a/base/base.xcodeproj/project.pbxproj b/base/base.xcodeproj/project.pbxproj
index 6a5372c..f6bb89c 100644
--- a/base/base.xcodeproj/project.pbxproj
+++ b/base/base.xcodeproj/project.pbxproj
@@ -331,7 +331,6 @@
7B8505A50E5B3FBE00730B43 /* skia_utils.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skia_utils.cc; sourceTree = "<group>"; };
7B8505A60E5B3FBE00730B43 /* skia_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = skia_utils.h; sourceTree = "<group>"; };
7B8505A80E5B3FBE00730B43 /* vector_canvas_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vector_canvas_unittest.cc; sourceTree = "<group>"; };
- 7BAF4F0A0E50A2FD00CA8A07 /* notimplemented.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = notimplemented.h; sourceTree = "<group>"; };
7BAF4F7B0E50A3BD00CA8A07 /* logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logging.h; sourceTree = "<group>"; };
7BAF501B0E50B84200CA8A07 /* base_paths.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = base_paths.cc; sourceTree = "<group>"; };
7BAF50740E50B8F100CA8A07 /* file_version_info_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = file_version_info_mac.mm; sourceTree = "<group>"; };
@@ -761,7 +760,6 @@
93611ADB0E5A7FC500F9405D /* message_pump.h */,
93611ADC0E5A7FC500F9405D /* message_pump_default.cc */,
93611ADD0E5A7FC500F9405D /* message_pump_default.h */,
- 7BAF4F0A0E50A2FD00CA8A07 /* notimplemented.h */,
825403390D92D2210006B936 /* observer_list.h */,
E4562C580E2802AC005E4685 /* observer_list_unittest.cc */,
ABF4B9B40DC2BC9F00A6E319 /* path_service.cc */,
diff --git a/base/build/base.vcproj b/base/build/base.vcproj
index 35295b9..7105b1b 100644
--- a/base/build/base.vcproj
+++ b/base/build/base.vcproj
@@ -442,10 +442,6 @@
>
</File>
<File
- RelativePath="..\notimplemented.h"
- >
- </File>
- <File
RelativePath="..\object_watcher.cc"
>
</File>
diff --git a/base/debug_util_posix.cc b/base/debug_util_posix.cc
index 6f9805f..f4da37c 100644
--- a/base/debug_util_posix.cc
+++ b/base/debug_util_posix.cc
@@ -10,7 +10,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include "base/notimplemented.h"
+#include "base/logging.h"
#include "base/string_piece.h"
bool DebugUtil::SpawnDebuggerOnProcess(unsigned /* process_id */) {
diff --git a/base/file_util_linux.cc b/base/file_util_linux.cc
index f5ddc33..6f55042 100644
--- a/base/file_util_linux.cc
+++ b/base/file_util_linux.cc
@@ -7,7 +7,6 @@
#include <string>
#include "base/logging.h"
-#include "base/notimplemented.h"
#include "base/string_util.h"
namespace file_util {
diff --git a/base/logging.cc b/base/logging.cc
index 8a23247..5b42825 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -36,7 +36,6 @@ typedef pthread_mutex_t* MutexHandle;
#include "base/command_line.h"
#include "base/debug_util.h"
#include "base/lock_impl.h"
-#include "base/notimplemented.h"
#include "base/string_piece.h"
#include "base/string_util.h"
#include "base/sys_string_conversions.h"
diff --git a/base/logging.h b/base/logging.h
index 168bc32..95cbfac 100644
--- a/base/logging.h
+++ b/base/logging.h
@@ -497,5 +497,39 @@ inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
return out << wstr.c_str();
}
+// The NOTIMPLEMENTED() macro annotates codepaths which have
+// not been implemented yet.
+//
+// The implementation of this macro is controlled by NOTIMPLEMENTED_POLICY:
+// 0 -- Do nothing (stripped by compiler)
+// 1 -- Warn at compile time
+// 2 -- Fail at compile time
+// 3 -- Fail at runtime (DCHECK)
+// 4 -- [default] LOG(ERROR) at runtime
+// 5 -- LOG(ERROR) at runtime, only once per call-site
+
+#ifndef NOTIMPLEMENTED_POLICY
+// Select default policy: LOG(ERROR)
+#define NOTIMPLEMENTED_POLICY 4
+#endif
+
+#if NOTIMPLEMENTED_POLICY == 0
+#define NOTIMPLEMENTED() ;
+#elif NOTIMPLEMENTED_POLICY == 1
+// TODO, figure out how to generate a warning
+#define NOTIMPLEMENTED() COMPILE_ASSERT(false, NOT_IMPLEMENTED)
+#elif NOTIMPLEMENTED_POLICY == 2
+#define NOTIMPLEMENTED() COMPILE_ASSERT(false, NOT_IMPLEMENTED)
+#elif NOTIMPLEMENTED_POLICY == 3
+#define NOTIMPLEMENTED() NOTREACHED()
+#elif NOTIMPLEMENTED_POLICY == 4
+#define NOTIMPLEMENTED() LOG(ERROR) << "NOT IMPLEMENTED!"
+#elif NOTIMPLEMENTED_POLICY == 5
+#define NOTIMPLEMENTED() do {\
+ static int count = 0;\
+ LOG_IF(ERROR, 0 == count++) << "NOT IMPLEMENTED!";\
+} while(0)
+#endif
+
#endif // BASE_LOGGING_H_
diff --git a/base/notimplemented.h b/base/notimplemented.h
deleted file mode 100644
index d5b5508..0000000
--- a/base/notimplemented.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_NOTIMPLEMENTED_H_
-#define BASE_NOTIMPLEMENTED_H_
-
-#include "base/basictypes.h"
-#include "base/logging.h"
-
-// The NOTIMPLEMENTED() macro annotates codepaths which have
-// not been implemented yet.
-//
-// The implementation of this macro is controlled by NOTIMPLEMENTED_POLICY:
-// 0 -- Do nothing (stripped by compiler)
-// 1 -- Warn at compile time
-// 2 -- Fail at compile time
-// 3 -- Fail at runtime (DCHECK)
-// 4 -- [default] LOG(ERROR) at runtime
-// 5 -- LOG(ERROR) at runtime, only once per call-site
-
-#ifndef NOTIMPLEMENTED_POLICY
-// Select default policy: LOG(ERROR)
-#define NOTIMPLEMENTED_POLICY 4
-#endif
-
-#if NOTIMPLEMENTED_POLICY == 0
-#define NOTIMPLEMENTED() ;
-#elif NOTIMPLEMENTED_POLICY == 1
-// TODO, figure out how to generate a warning
-#define NOTIMPLEMENTED() COMPILE_ASSERT(false, NOT_IMPLEMENTED)
-#elif NOTIMPLEMENTED_POLICY == 2
-#define NOTIMPLEMENTED() COMPILE_ASSERT(false, NOT_IMPLEMENTED)
-#elif NOTIMPLEMENTED_POLICY == 3
-#define NOTIMPLEMENTED() NOTREACHED()
-#elif NOTIMPLEMENTED_POLICY == 4
-#define NOTIMPLEMENTED() LOG(ERROR) << "NOT IMPLEMENTED!"
-#elif NOTIMPLEMENTED_POLICY == 5
-#define NOTIMPLEMENTED() do {\
- static int count = 0;\
- LOG_IF(ERROR, 0 == count++) << "NOT IMPLEMENTED!";\
-} while(0)
-#endif
-
-#endif // BASE_NOTIMPLEMENTED_H_
-
diff --git a/net/disk_cache/cache_util_posix.cc b/net/disk_cache/cache_util_posix.cc
index fa1a324..7e7bc63 100644
--- a/net/disk_cache/cache_util_posix.cc
+++ b/net/disk_cache/cache_util_posix.cc
@@ -6,7 +6,6 @@
#include "base/file_util.h"
#include "base/logging.h"
-#include "base/notimplemented.h"
namespace disk_cache {
diff --git a/net/disk_cache/file_posix.cc b/net/disk_cache/file_posix.cc
index 4059418..bd2e779 100644
--- a/net/disk_cache/file_posix.cc
+++ b/net/disk_cache/file_posix.cc
@@ -4,7 +4,7 @@
#include "net/disk_cache/file.h"
-#include "base/notimplemented.h"
+#include "base/logging.h"
#include "net/disk_cache/disk_cache.h"
namespace disk_cache {
diff --git a/net/disk_cache/os_file_posix.cc b/net/disk_cache/os_file_posix.cc
index 6574423..7b8fe0d 100644
--- a/net/disk_cache/os_file_posix.cc
+++ b/net/disk_cache/os_file_posix.cc
@@ -4,7 +4,7 @@
#include "net/disk_cache/os_file.h"
-#include "base/notimplemented.h"
+#include "base/logging.h"
namespace disk_cache {
diff --git a/net/disk_cache/trace.cc b/net/disk_cache/trace.cc
index a5fd7dc..c656cef 100644
--- a/net/disk_cache/trace.cc
+++ b/net/disk_cache/trace.cc
@@ -9,7 +9,6 @@
#endif
#include "base/logging.h"
-#include "base/notimplemented.h"
// Change this value to 1 to enable tracing on a release build. By default,
// tracing is enabled only on debug builds.
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index 7f3594e..9b2c468 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -4,7 +4,7 @@
#include "net/http/http_network_layer.h"
-#include "base/notimplemented.h"
+#include "base/logging.h"
#include "net/base/client_socket_factory.h"
#include "net/http/http_network_session.h"
#include "net/http/http_network_transaction.h"
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index fb26247..1d48090 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -11,8 +11,8 @@
#include <algorithm>
+#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/notimplemented.h"
#include "base/string_tokenizer.h"
#include "base/string_util.h"
#include "googleurl/src/gurl.h"
generated by cgit v1.1 at 2025-01-16 11:53:49 +0000