From df75e1de1238c157580ec10d6f9478d7222b4d69 Mon Sep 17 00:00:00 2001
From: scottmg <scottmg@chromium.org>
Date: Fri, 20 Feb 2015 14:42:35 -0800
Subject: win vs2015: avoid variable shadowing warning in url_canon.h
d:\src\cr2\src\url\url_canon.h(737): error C2220: warning treated as error - no 'object' file generated
d:\src\cr2\src\url\url_canon.h(737): warning C4459: declaration of 'empty_string' hides global declaration
d:\src\cr2\src\url\gurl.cc(22): note: see declaration of '`anonymous-namespace'::empty_string'
R=brettw@chromium.org
BUG=440500
Review URL: https://codereview.chromium.org/937473003
Cr-Commit-Position: refs/heads/master@{#317431}
---
url/url_canon.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'url')
diff --git a/url/url_canon.h b/url/url_canon.h
index 89e3509..432f291 100644
--- a/url/url_canon.h
+++ b/url/url_canon.h
@@ -734,8 +734,8 @@ class Replacements {
// Returns a pointer to a static empty string that is used as a placeholder
// to indicate a component should be deleted (see below).
const CHAR* Placeholder() {
- static const CHAR empty_string = 0;
- return &empty_string;
+ static const CHAR empty_cstr = 0;
+ return &empty_cstr;
}
// We support three states:
--
cgit v1.1