diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-15 09:30:46 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-15 09:30:46 +0000 |
| commit | 2244f0a5a874fd21da847fca2afc26dc16de7ccc (patch) | |
| tree | cfdf45cc5eca43593ecd0e65eb1d2f4caf033f92 /url/url_canon_icu.h | |
| parent | 0b7b7c213dec8e26c4c061f316e938923b1a7f02 (diff) | |
| download | chromium_src-2244f0a5a874fd21da847fca2afc26dc16de7ccc.zip chromium_src-2244f0a5a874fd21da847fca2afc26dc16de7ccc.tar.gz chromium_src-2244f0a5a874fd21da847fca2afc26dc16de7ccc.tar.bz2 | |
Revert 193777 "url: Changes to make it build standalone."
url/url_canon_stdstring.h:65: error: undefined reference to 'vtable for url_canon::StdStringCanonOutput'
> url: Changes to make it build standalone.
>
> - Update the gyp file.
> - Rename the gyp file from googleurl.gyp to url.gyp, so it matches the directory
> name.
> - Update the header include paths.
> - Update the header include guards.
> - Rename the target name from googleurl to url and googleurl_unittests to
> url_unittests.
> - Add missing OVERRIDEs where clang complains.
>
> BUG=229660
> TEST=url_unittests
> R=brettw@chromium.org
>
> Review URL: https://codereview.chromium.org/14016005
TBR=tfarina@chromium.org
Review URL: https://codereview.chromium.org/14264002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url/url_canon_icu.h')
| -rw-r--r-- | url/url_canon_icu.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/url/url_canon_icu.h b/url/url_canon_icu.h index 9f54f1a..e529fcb 100644 --- a/url/url_canon_icu.h +++ b/url/url_canon_icu.h @@ -29,11 +29,10 @@ // ICU integration functions. -#ifndef URL_URL_CANON_ICU_H_ -#define URL_URL_CANON_ICU_H_ +#ifndef GOOGLEURL_SRC_URL_CANON_ICU_H__ +#define GOOGLEURL_SRC_URL_CANON_ICU_H__ -#include "base/compiler_specific.h" -#include "url/url_canon.h" +#include "googleurl/src/url_canon.h" typedef struct UConverter UConverter; @@ -52,7 +51,7 @@ class ICUCharsetConverter : public CharsetConverter { GURL_API virtual void ConvertFromUTF16(const char16* input, int input_len, - CanonOutput* output) OVERRIDE; + CanonOutput* output); private: // The ICU converter, not owned by this class. @@ -61,4 +60,4 @@ class ICUCharsetConverter : public CharsetConverter { } // namespace url_canon -#endif // URL_URL_CANON_ICU_H_ +#endif // GOOGLEURL_SRC_URL_CANON_ICU_H__ |