diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 23:01:20 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 23:01:20 +0000 |
commit | 42ff47b781b72643d2c5a2c4fe2159b4c3e20347 (patch) | |
tree | 091ea301fdd6bdb3ae280f015571bfb4a0da11b6 /o3d/core | |
parent | 0fcfb2a1252c8665c8078aa1ccd94b5153a92f18 (diff) | |
download | chromium_src-42ff47b781b72643d2c5a2c4fe2159b4c3e20347.zip chromium_src-42ff47b781b72643d2c5a2c4fe2159b4c3e20347.tar.gz chromium_src-42ff47b781b72643d2c5a2c4fe2159b4c3e20347.tar.bz2 |
Change #ifdef _DEBUG test to #ifndef NDEBUG test.
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/5991010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core')
-rw-r--r-- | o3d/core/cross/gl/renderer_gl.cc | 2 | ||||
-rw-r--r-- | o3d/core/cross/gles2/renderer_gles2.cc | 8 | ||||
-rw-r--r-- | o3d/core/cross/types.h | 2 |
3 files changed, 6 insertions, 6 deletions
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) |