summaryrefslogtreecommitdiffstats
path: root/cloud_print/service
diff options
context:
space:
mode:
authorscottmg <scottmg@chromium.org>2015-06-09 09:35:33 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-09 16:36:07 +0000
commit7380268da316fcf7a1737eebd388392fa9acbb46 (patch)
tree2efd71b700b10548b5ae01e5915956fae3bb0a15 /cloud_print/service
parenta4526b6543681775d9f28850cba970809d6f893a (diff)
downloadchromium_src-7380268da316fcf7a1737eebd388392fa9acbb46.zip
chromium_src-7380268da316fcf7a1737eebd388392fa9acbb46.tar.gz
chromium_src-7380268da316fcf7a1737eebd388392fa9acbb46.tar.bz2
vs2015: fix const warning in cloud_print_service.cc
FAILED: ninja -t msvc -e environment.x86 -- "d:\src\depot_tools\win_toolchain\vs_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\cloud_print\service\win\cloud_print_service.cloud_print_service.obj.rsp /c ..\..\cloud_print\service\win\cloud_print_service.cc /Foobj\cloud_print\service\win\cloud_print_service.cloud_print_service.obj /Fdobj\cloud_print\service\cloud_print_service.cc.pdb d:\src\cr3\src\cloud_print\service\win\cloud_print_service.cc(151): error C2440: 'return': cannot convert from 'const TCHAR *' to 'wchar_t *' d:\src\cr3\src\cloud_print\service\win\cloud_print_service.cc(151): note: Conversion loses qualifiers R=vitalybuka@chromium.org BUG=440500 Review URL: https://codereview.chromium.org/1165303003 Cr-Commit-Position: refs/heads/master@{#333503}
Diffstat (limited to 'cloud_print/service')
-rw-r--r--cloud_print/service/win/cloud_print_service.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc
index c1b9601..b3761d3 100644
--- a/cloud_print/service/win/cloud_print_service.cc
+++ b/cloud_print/service/win/cloud_print_service.cc
@@ -147,7 +147,7 @@ class CloudPrintServiceModule
controller_(new ServiceController()) {
}
- static wchar_t* GetAppIdT() {
+ static const wchar_t* GetAppIdT() {
return ServiceController::GetAppIdT();
};