Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(385)

Issue 518533002: Move StringComparator<string16>::operator() to header (Closed)

Created:
6 years, 3 months ago by scottmg
Modified:
6 years, 3 months ago
CC:
chromium-reviews, jshin+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

Move StringComparator<string16>::operator() to header Enabling /Zc:inline on static release build results in FAILED: E:\b\depot_tools\python276_bin\python.exe gyp-win-tool link-with-manifests environment.x64 True chrome.dll "E:\b\depot_tools\python276_bin\python.exe gyp-win-tool link-wrapper environment.x64 False link.exe /nologo /IMPLIB:chrome.dll.lib /DLL /OUT:chrome.dll @chrome.dll.rsp" 2 mt.exe rc.exe "obj\chrome\chrome_main_dll.chrome.dll.intermediate.manifest" obj\chrome\chrome_main_dll.chrome.dll.generated.manifest ..\..\chrome\app\chrome.dll.manifest browser_2.lib(browser_2.character_encoding.obj) : error LNK2019: unresolved external symbol "public: bool __cdecl l10n_util::StringComparator<class std::basic_string<wchar_t,struct std::char_traits<wchar_t>,class std::allocator<wchar_t> > >::operator()(class std::basic_string<wchar_t,struct std::char_traits<wchar_t>,class std::allocator<wchar_t> > const &,class std::basic_string<wchar_t,struct std::char_traits<wchar_t>,class std::allocator<wchar_t> > const &)" (??R?$StringComparator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@l10n_util@@QEAA_NAEBV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@0@Z) referenced in function "void __cdecl std::_Adjust_heap<struct CharacterEncoding::EncodingInfo *,__int64,struct CharacterEncoding::EncodingInfo,class l10n_util::StringComparator<struct CharacterEncoding::EncodingInfo> >(struct CharacterEncoding::EncodingInfo *,__int64,__int64,struct CharacterEncoding::EncodingInfo &&,class l10n_util::StringComparator<struct CharacterEncoding::EncodingInfo>)" (??$_Adjust_heap@PEAUEncodingInfo@CharacterEncoding@@_JU12@V?$StringComparator@UEncodingInfo@CharacterEncoding@@@l10n_util@@@std@@YAXPEAUEncodingInfo@CharacterEncoding@@_J1$$QEAU12@V?$StringComparator@UEncodingInfo@CharacterEncoding@@@l10n_util@@@Z) browser_1.lib(browser_1.background_application_list_model.obj) : error LNK2001: unresolved external symbol "public: bool __cdecl l10n_util::StringComparator<class std::basic_string<wchar_t,struct std::char_traits<wchar_t>,class std::allocator<wchar_t> > >::operator()(class std::basic_string<wchar_t,struct std::char_traits<wchar_t>,class std::allocator<wchar_t> > const &,class std::basic_string<wchar_t,struct std::char_traits<wchar_t>,class std::allocator<wchar_t> > const &)" (??R?$StringComparator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@l10n_util@@QEAA_NAEBV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@0@Z) So, move StringComparator<base::string16>::operator() into header and mark it inline, so that it's available in all translation units where it's used. The previous code was correct, but this makes all compilers happy. /Zc:inline ref: http://msdn.microsoft.com/en-us/library/dn642448.aspx R=rnk@chromium.org TBR=jshin@chromium.org BUG=350018 Committed: https://crrev.com/51d4852246362fc385663b932c2b0f6f1b4a6092 Cr-Commit-Position: refs/heads/master@{#292559}

Patch Set 1 #

Patch Set 2 : inline #

Patch Set 3 : . #

Unified diffs Side-by-side diffs Delta from patch set Stats (+11 lines, -15 lines) Patch
M ui/base/l10n/l10n_util.cc View 1 chunk +0 lines, -12 lines 0 comments Download
M ui/base/l10n/l10n_util_collator.h View 1 2 1 chunk +11 lines, -3 lines 0 comments Download

Messages

Total messages: 19 (0 generated)
scottmg
Bequeathing to you Reid due to https://www.mail-archive.com/cfe-commits@cs.uiuc.edu/msg100160.html . And I'm hoping you can confirm the ...
6 years, 3 months ago (2014-08-28 20:50:25 UTC) #1
scottmg
Hmm, not sure. Maybe this is a cl/link bug then?
6 years, 3 months ago (2014-08-28 21:19:06 UTC) #2
Reid Kleckner
Yeah, I think this is an MSVC bug. Clang seems to think the specialization of ...
6 years, 3 months ago (2014-08-28 21:25:48 UTC) #3
Reid Kleckner
We think we understand the MSVC bug: they seem to think that full specializations of ...
6 years, 3 months ago (2014-08-28 21:40:24 UTC) #4
scottmg
On 2014/08/28 21:40:24, Reid Kleckner wrote: > We think we understand the MSVC bug: they ...
6 years, 3 months ago (2014-08-28 21:52:37 UTC) #5
scottmg
On 2014/08/28 21:52:37, scottmg wrote: > On 2014/08/28 21:40:24, Reid Kleckner wrote: > > We ...
6 years, 3 months ago (2014-08-28 21:53:24 UTC) #6
scottmg
On 2014/08/28 21:53:24, scottmg wrote: > On 2014/08/28 21:52:37, scottmg wrote: > > On 2014/08/28 ...
6 years, 3 months ago (2014-08-28 22:32:43 UTC) #7
Reid Kleckner
lgtm Hooray, C++!
6 years, 3 months ago (2014-08-28 22:37:07 UTC) #8
scottmg
scottmg@chromium.org changed reviewers: + jshin@chromium.org
6 years, 3 months ago (2014-08-28 22:37:50 UTC) #9
scottmg
+jshin for OWNERS
6 years, 3 months ago (2014-08-28 22:38:04 UTC) #10
scottmg
The CQ bit was checked by scottmg@chromium.org
6 years, 3 months ago (2014-08-28 22:38:29 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/scottmg@chromium.org/518533002/40001
6 years, 3 months ago (2014-08-28 22:39:50 UTC) #12
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: win_chromium_x64_rel_swarming on tryserver.chromium.win ...
6 years, 3 months ago (2014-08-28 23:47:17 UTC) #13
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 3 months ago (2014-08-29 01:28:27 UTC) #14
commit-bot: I haz the power
Try jobs failed on following builders: win_chromium_x64_rel_swarming on tryserver.chromium.win (http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_rel_swarming/builds/4269)
6 years, 3 months ago (2014-08-29 01:28:28 UTC) #15
scottmg
The CQ bit was checked by scottmg@chromium.org
6 years, 3 months ago (2014-08-29 01:37:49 UTC) #16
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/scottmg@chromium.org/518533002/40001
6 years, 3 months ago (2014-08-29 01:38:29 UTC) #17
commit-bot: I haz the power
Committed patchset #3 (id:40001) as 5d92161af8c783f87d9e67afea32230137c2a9ba
6 years, 3 months ago (2014-08-29 02:49:02 UTC) #18
commit-bot: I haz the power
6 years, 3 months ago (2014-09-10 03:05:47 UTC) #19
Message was sent while issue was closed.
Patchset 3 (id:??) landed as
https://crrev.com/51d4852246362fc385663b932c2b0f6f1b4a6092
Cr-Commit-Position: refs/heads/master@{#292559}

Powered by Google App Engine
This is Rietveld 408576698