chrome_frame/chrome_tab.cc - Issue 71963002: Fix compilation on 2013 debug due to ATL changes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome_frame/chrome_tab.cc

Issue 71963002: Fix compilation on 2013 debug due to ATL changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome_frame/chrome_tab.cc

diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc

index d54d73cbd493ba6b6520895fdd4797221edab517..b3c209985600a4f9c8381bb06b1f5084275525c5 100644

--- a/chrome_frame/chrome_tab.cc

+++ b/chrome_frame/chrome_tab.cc

@@ -893,7 +893,7 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance,

LPVOID reserved) {

UNREFERENCED_PARAMETER(instance);

if (reason == DLL_PROCESS_ATTACH) {

-#ifndef NDEBUG

+#if _ATL_VER < 0x0C00 && !defined(NDEBUG)

// Silence traces from the ATL registrar to reduce the log noise.

ATL::CTrace::s_trace.ChangeCategory(atlTraceRegistrar, 0,

ATLTRACESTATUS_DISABLED);

« no previous file with comments | « no previous file | no next file » | no next file with comments »