diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 00:53:33 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 00:53:33 +0000 |
| commit | 919f9310c2059e4fd6c4f640d5d62b839705c4c3 (patch) | |
| tree | e253a8493c34c34dda6e36a76645a3d2fb43a508 /win8 | |
| parent | 9ac6fa3665a767e8502ed1e9cfbb2cf475d0384b (diff) | |
| download | chromium_src-919f9310c2059e4fd6c4f640d5d62b839705c4c3.zip chromium_src-919f9310c2059e4fd6c4f640d5d62b839705c4c3.tar.gz chromium_src-919f9310c2059e4fd6c4f640d5d62b839705c4c3.tar.bz2 | |
__FUNCTION__ cannot concatenate with constant strings in all compilers.
According to http://www.delorie.com/gnu/docs/gcc/gcc_78.html (bottom),
The identifier __FUNCTION__ is implicitly declared by the translator
as if, immediately following the opening brace of each function
definition, the declaration
static const char __FUNCTION__[] = "function-name";
So use an explicit << instead of relying on string constant concatenation.
BUG=82385
R=cpu@chromium.org
Review URL: https://codereview.chromium.org/357583002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/test/open_with_dialog_controller.cc | 2 | ||||
| -rw-r--r-- | win8/test/ui_automation_client.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/win8/test/open_with_dialog_controller.cc b/win8/test/open_with_dialog_controller.cc index b9a1609..e980197 100644 --- a/win8/test/open_with_dialog_controller.cc +++ b/win8/test/open_with_dialog_controller.cc @@ -167,7 +167,7 @@ void OpenWithDialogController::Context::OnTimeout() { DCHECK(thread_checker_.CalledOnValidThread()); // This is a LOG rather than a DLOG since it represents something that needs // to be investigated and fixed. - LOG(ERROR) << __FUNCTION__ " state: " << state_; + LOG(ERROR) << __FUNCTION__ << " state: " << state_; state_ = CONTEXT_FINISHED; NotifyClientAndDie(); diff --git a/win8/test/ui_automation_client.cc b/win8/test/ui_automation_client.cc index 6af9bc4..153b917 100644 --- a/win8/test/ui_automation_client.cc +++ b/win8/test/ui_automation_client.cc @@ -321,7 +321,7 @@ void UIAutomationClient::Context::HandleWindowOpen( } if (V_VT(&var) != VT_BSTR) { - LOG(ERROR) << __FUNCTION__ " class name is not a BSTR: " << V_VT(&var); + LOG(ERROR) << __FUNCTION__ << " class name is not a BSTR: " << V_VT(&var); return; } |