summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ceee/testing/utils/test_utils.h4
-rw-r--r--chrome/default_plugin/install_dialog.cc6
-rw-r--r--chrome/renderer/extensions/bindings_utils.cc4
-rw-r--r--chrome/renderer/extensions/event_bindings.cc4
-rw-r--r--chrome/renderer/extensions/extension_process_bindings.cc4
-rw-r--r--chrome_frame/test/ie_event_sink.h4
-rw-r--r--media/base/yuv_row_posix.cc4
-rw-r--r--o3d/breakpad/linux/breakpad.cc2
-rw-r--r--o3d/core/cross/gl/renderer_gl.cc2
-rw-r--r--o3d/core/cross/gles2/renderer_gles2.cc8
-rw-r--r--o3d/core/cross/types.h2
-rw-r--r--o3d/import/cross/archive_processor.h2
12 files changed, 23 insertions, 23 deletions
diff --git a/ceee/testing/utils/test_utils.h b/ceee/testing/utils/test_utils.h
index 1fb03b9..3e3df1f 100644
--- a/ceee/testing/utils/test_utils.h
+++ b/ceee/testing/utils/test_utils.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
//
@@ -316,7 +316,7 @@ inline ::std::ostream& operator<<(::std::ostream& os, const VARIANT& var) {
//
// For noinline pragma, see
// http://msdn.microsoft.com/en-us/library/cx053bca(VS.71).aspx
-#ifdef _DEBUG
+#ifndef NDEBUG
#define TEST_DEBUG_ONLY(test_case_name, test_name) \
TEST(test_case_name, test_name)
#define TEST_F_DEBUG_ONLY(test_fixture, test_name) \
diff --git a/chrome/default_plugin/install_dialog.cc b/chrome/default_plugin/install_dialog.cc
index e61001a..87de98b 100644
--- a/chrome/default_plugin/install_dialog.cc
+++ b/chrome/default_plugin/install_dialog.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -73,9 +73,9 @@ HWND PluginInstallDialog::Create(HWND parent_window, LPARAM init_param) {
_AtlWinModule.AddCreateWndData(&m_thunk.cd, this);
-#ifdef _DEBUG
+#ifndef NDEBUG
m_bModal = false;
-#endif // _DEBUG
+#endif // NDEBUG
HINSTANCE instance_handle = _AtlBaseModule.GetResourceInstance();
diff --git a/chrome/renderer/extensions/bindings_utils.cc b/chrome/renderer/extensions/bindings_utils.cc
index 4776966..1cc5285 100644
--- a/chrome/renderer/extensions/bindings_utils.cc
+++ b/chrome/renderer/extensions/bindings_utils.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -62,7 +62,7 @@ v8::Handle<v8::Value> ExtensionBase::GetChromeHidden(
hidden = v8::Object::New();
global->SetHiddenValue(v8::String::New(kChromeHidden), hidden);
-#ifdef _DEBUG
+#ifndef NDEBUG
// Tell extension_process_bindings.js to validate callbacks and events
// against their schema definitions in api/extension_api.json.
v8::Local<v8::Object>::Cast(hidden)
diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc
index d960509..4f95ac7 100644
--- a/chrome/renderer/extensions/event_bindings.cc
+++ b/chrome/renderer/extensions/event_bindings.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -370,7 +370,7 @@ void EventBindings::CallFunction(const std::string& extension_id,
// string if a validation error has occured.
// TODO(rafaelw): Consider only doing this check if function_name ==
// "Event.dispatchJSON".
-#ifdef _DEBUG
+#ifndef NDEBUG
if (!retval.IsEmpty() && !retval->IsUndefined()) {
std::string error = *v8::String::AsciiValue(retval);
DCHECK(false) << error;
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index 7370e3d..1a055bd 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -594,7 +594,7 @@ void ExtensionProcessBindings::HandleResponse(int request_id, bool success,
request->second->context, "handleResponse", arraysize(argv), argv);
// In debug, the js will validate the callback parameters and return a
// string if a validation error has occured.
-#ifdef _DEBUG
+#ifndef NDEBUG
if (!retval.IsEmpty() && !retval->IsUndefined()) {
std::string error = *v8::String::AsciiValue(retval);
DCHECK(false) << error;
diff --git a/chrome_frame/test/ie_event_sink.h b/chrome_frame/test/ie_event_sink.h
index 78cfd52..41672a7 100644
--- a/chrome_frame/test/ie_event_sink.h
+++ b/chrome_frame/test/ie_event_sink.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -214,7 +214,7 @@ END_SINK_MAP()
VARIANT_BOOL* cancel);
STDMETHOD_(void, OnQuit)();
-#ifdef _DEBUG
+#ifndef NDEBUG
STDMETHOD(Invoke)(DISPID dispid,
REFIID riid, LCID lcid,
WORD flags,
diff --git a/media/base/yuv_row_posix.cc b/media/base/yuv_row_posix.cc
index a66fa7b..2217f38 100644
--- a/media/base/yuv_row_posix.cc
+++ b/media/base/yuv_row_posix.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
#include "media/base/yuv_row.h"
-#ifdef _DEBUG
+#ifndef NDEBUG
#include "base/logging.h"
#else
#define DCHECK(a)
diff --git a/o3d/breakpad/linux/breakpad.cc b/o3d/breakpad/linux/breakpad.cc
index 4ef9bc3..6fec736 100644
--- a/o3d/breakpad/linux/breakpad.cc
+++ b/o3d/breakpad/linux/breakpad.cc
@@ -48,7 +48,7 @@ static const std::string kBreakpadProduct = "Google_O3D_Plugin_Linux";
static const std::string kBreakpadVersion = "unknown";
static const std::string kBreakpadGUID = "unknown";
static const std::string kBreakpadEmail = "unknown";
-#ifdef _DEBUG
+#ifndef NDEBUG
static const std::string kBreakpadServer =
"http://clients2.google.com/cr/staging_report";
#else
diff --git a/o3d/core/cross/gl/renderer_gl.cc b/o3d/core/cross/gl/renderer_gl.cc
index c3bef52..098f724 100644
--- a/o3d/core/cross/gl/renderer_gl.cc
+++ b/o3d/core/cross/gl/renderer_gl.cc
@@ -176,7 +176,7 @@ GLenum ConvertStencilOp(State::StencilOperation stencil_func) {
// to the context.
bool InstallFramebufferObjects(const RenderSurface* surface,
const RenderDepthStencilSurface* surface_depth) {
-#ifdef _DEBUG
+#ifndef NDEBUG
GLint bound_framebuffer;
::glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &bound_framebuffer);
DCHECK(bound_framebuffer != 0);
diff --git a/o3d/core/cross/gles2/renderer_gles2.cc b/o3d/core/cross/gles2/renderer_gles2.cc
index 616267c..47939c5 100644
--- a/o3d/core/cross/gles2/renderer_gles2.cc
+++ b/o3d/core/cross/gles2/renderer_gles2.cc
@@ -184,7 +184,7 @@ GLenum ConvertStencilOp(State::StencilOperation stencil_func) {
// to the context.
bool InstallFramebufferObjects(const RenderSurface* surface,
const RenderDepthStencilSurface* surface_depth) {
-#ifdef _DEBUG
+#ifndef NDEBUG
GLint bound_framebuffer;
::glGetIntegerv(GL_FRAMEBUFFER_BINDING, &bound_framebuffer);
DCHECK(bound_framebuffer != 0);
@@ -847,9 +847,9 @@ LRESULT CALLBACK IntermediateWindowProc(HWND window,
Renderer::InitStatus GetWindowsPixelFormat(HWND window,
Features* features,
int* pixel_format) {
- // We must initialize a GLES2 context before we can determine the multi-sampling
- // supported on the current hardware, so we create an intermediate window
- // and context here.
+ // We must initialize a GLES2 context before we can determine the
+ // multi-sampling supported on the current hardware, so we create an
+ // intermediate window and context here.
HINSTANCE module_handle;
if (!::GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT |
GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,
diff --git a/o3d/core/cross/types.h b/o3d/core/cross/types.h
index 7971ceb..791410c 100644
--- a/o3d/core/cross/types.h
+++ b/o3d/core/cross/types.h
@@ -54,7 +54,7 @@
#include "core/cross/float_n.h"
// Defines ---------------------------------
-#ifdef _DEBUG
+#ifndef NDEBUG
#define O3D_ASSERT(x) assert((x))
#else
#define O3D_ASSERT(x)
diff --git a/o3d/import/cross/archive_processor.h b/o3d/import/cross/archive_processor.h
index d404249..5e55a24 100644
--- a/o3d/import/cross/archive_processor.h
+++ b/o3d/import/cross/archive_processor.h
@@ -89,7 +89,7 @@ class ArchiveProcessor: public StreamProcessor {
DISALLOW_COPY_AND_ASSIGN(ArchiveProcessor);
};
-#ifdef _DEBUG
+#ifndef NDEBUG
// For debugging, report a zlib or i/o error
extern void zerr(int result);
#endif
generated by cgit v1.1 at 2025-01-19 18:50:24 +0000