Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: add "icu::" namespace to ICU symbols #18667

Merged
merged 0 commits into from Feb 10, 2018

Conversation

@srl295
Copy link
Member

srl295 commented Feb 9, 2018

In ICU 61.x, icu4c will no longer put its declarations in the global namespace.
Everything will be in the "icu::" namespace (or icu_60:: in the linker).
Prepare for this.

Upstream: https://ssl.icu-project.org/trac/ticket/13460

  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows [commit guidelines]
Affected core subsystem(s)

tools

@srl295 srl295 added tools intl labels Feb 9, 2018

@srl295 srl295 self-assigned this Feb 9, 2018

@srl295 srl295 force-pushed the srl295:icu-add-using branch from 6fa44c9 to c85423c Feb 9, 2018

@srl295

This comment has been minimized.

Copy link
Member Author

srl295 commented Feb 9, 2018

ICU 61.0 (in progress) works unmodified with this change.

@TimothyGu
Copy link
Member

TimothyGu left a comment

The commit message needs to be revised. Otherwise LGTM.

UnicodeString utf16 =
UnicodeString::fromUTF8(StringPiece(message.data(), message.length()));
icu::UnicodeString utf16 =
icu::UnicodeString::fromUTF8(icu::StringPiece(message.data(), message.length()));

This comment has been minimized.

Copy link
@bnoordhuis

bnoordhuis Feb 9, 2018

Member

Long line, can you wrap this at 80 columns?

@srl295

This comment has been minimized.

Copy link
Member Author

srl295 commented Feb 9, 2018

@bnoordhuis wrapped.

@TimothyGu yeah, scope changed as i was fixing it. Do you have a recommendation?

@TimothyGu

This comment has been minimized.

Copy link
Member

TimothyGu commented Feb 9, 2018

@srl295 Oh oops I meant the PR title. The commit message is already correct.

@TimothyGu TimothyGu changed the title tools: add "using namespace icu" tools: add "icu::" namespace to ICU symbols Feb 9, 2018

@jasnell

jasnell approved these changes Feb 9, 2018

Copy link
Member

jasnell left a comment

nice. happy to see this.

@srl295 srl295 force-pushed the srl295:icu-add-using branch from 3ee37c1 to fd95720 Feb 10, 2018

@srl295

This comment has been minimized.

Copy link
Member Author

srl295 commented Feb 10, 2018

@srl295 srl295 closed this Feb 10, 2018

@srl295 srl295 force-pushed the srl295:icu-add-using branch from fd95720 to b8f47b2 Feb 10, 2018

@srl295 srl295 merged commit b8f47b2 into nodejs:master Feb 10, 2018

@srl295 srl295 deleted the srl295:icu-add-using branch Feb 10, 2018

@srl295 srl295 referenced this pull request Feb 10, 2018

Open

git-node-land: lease? #172

srl295 added a commit to srl295/node that referenced this pull request Mar 26, 2018

deps: ICU 61.1 bump
- Update to released ICU 61.1, including:
  - CLDR 33 (many new languages and data improvements)
  - Many small API additions, improvements, and bug fixes
  - note: 'icu::' namespace is no longer used by default
   (Necessated nodejs#18667 )

@srl295 srl295 referenced this pull request Mar 26, 2018

Merged

deps: ICU 61.1 bump #19621

0 of 3 tasks complete

srl295 added a commit to srl295/node that referenced this pull request Mar 26, 2018

deps: ICU 61.1 bump
- Update to released ICU 61.1, including:
  - CLDR 33 (many new languages and data improvements)
  - Many small API additions, improvements, and bug fixes
  - note: 'icu::' namespace is no longer used by default
   (Necessated nodejs#18667 )
@srl295

This comment has been minimized.

Copy link
Member Author

srl295 commented Mar 28, 2018

@ilovezfs ^ label added as note to self… 

@ilovezfs

This comment has been minimized.

Copy link

ilovezfs commented Mar 28, 2018

Thanks @srl295!

srl295 added a commit to srl295/node that referenced this pull request Apr 3, 2018

deps: ICU 61.1 bump
- Update to released ICU 61.1, including:
  - CLDR 33 (many new languages and data improvements)
  - Many small API additions, improvements, and bug fixes
  - note: 'icu::' namespace is no longer used by default
   (Necessated nodejs#18667 )

PR-URL: nodejs#19621
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

targos added a commit that referenced this pull request Apr 3, 2018

deps: ICU 61.1 bump
- Update to released ICU 61.1, including:
  - CLDR 33 (many new languages and data improvements)
  - Many small API additions, improvements, and bug fixes
  - note: 'icu::' namespace is no longer used by default
   (Necessated #18667 )

PR-URL: #19621
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

kfarnung added a commit to kfarnung/ChakraCore that referenced this pull request Apr 9, 2018

Set `U_USING_ICU_NAMESPACE` to 0 by default
ICU61 updated the value of `U_USING_ICU_NAMESPACE` to 0 by default. In
order to maintain compatibility this change updates our ICU includes to
match and adds the `icu::` namespace explicitly when needed.

Refs: nodejs/node#18667
Refs: https://ssl.icu-project.org/trac/ticket/13460

kfarnung added a commit to kfarnung/node-chakracore that referenced this pull request Apr 9, 2018

Set `U_USING_ICU_NAMESPACE` to 0 by default
ICU61 updated the value of `U_USING_ICU_NAMESPACE` to 0 by default. In
order to maintain compatibility this change updates our ICU includes to
match and adds the `icu::` namespace explicitly when needed.

Refs: nodejs/node#18667
Refs: https://ssl.icu-project.org/trac/ticket/13460

chakrabot pushed a commit to Microsoft/ChakraCore that referenced this pull request Apr 9, 2018

[MERGE #4952 @kfarnung] Set `U_USING_ICU_NAMESPACE` to 0 by default
Merge pull request #4952 from kfarnung:icu61

ICU61 updated the value of `U_USING_ICU_NAMESPACE` to 0 by default. In
order to maintain compatibility this change updates our ICU includes to
match and adds the `icu::` namespace explicitly when needed.

Refs: nodejs/node#18667
Refs: https://ssl.icu-project.org/trac/ticket/13460

chakrabot added a commit to nodejs/node-chakracore that referenced this pull request Apr 9, 2018

deps: update ChakraCore to Microsoft/ChakraCore@7f1ab68
[MERGE #4952 @kfarnung] Set `U_USING_ICU_NAMESPACE` to 0 by default

Merge pull request #4952 from kfarnung:icu61

ICU61 updated the value of `U_USING_ICU_NAMESPACE` to 0 by default. In
order to maintain compatibility this change updates our ICU includes to
match and adds the `icu::` namespace explicitly when needed.

Refs: nodejs/node#18667
Refs: https://ssl.icu-project.org/trac/ticket/13460

Reviewed-By: chakrabot <chakrabot@users.noreply.github.com>

chakrabot pushed a commit to Microsoft/ChakraCore that referenced this pull request Apr 9, 2018

[1.9>master] [MERGE #4952 @kfarnung] Set `U_USING_ICU_NAMESPACE` to 0…
… by default

Merge pull request #4952 from kfarnung:icu61

ICU61 updated the value of `U_USING_ICU_NAMESPACE` to 0 by default. In
order to maintain compatibility this change updates our ICU includes to
match and adds the `icu::` namespace explicitly when needed.

Refs: nodejs/node#18667
Refs: https://ssl.icu-project.org/trac/ticket/13460

chakrabot added a commit to nodejs/node-chakracore that referenced this pull request Apr 9, 2018

deps: update ChakraCore to Microsoft/ChakraCore@9e617e7
[1.9>master] [MERGE #4952 @kfarnung] Set `U_USING_ICU_NAMESPACE` to 0 by default

Merge pull request #4952 from kfarnung:icu61

ICU61 updated the value of `U_USING_ICU_NAMESPACE` to 0 by default. In
order to maintain compatibility this change updates our ICU includes to
match and adds the `icu::` namespace explicitly when needed.

Refs: nodejs/node#18667
Refs: https://ssl.icu-project.org/trac/ticket/13460

Reviewed-By: chakrabot <chakrabot@users.noreply.github.com>

kfarnung added a commit to nodejs/node-chakracore that referenced this pull request Apr 10, 2018

deps: update ChakraCore to Microsoft/ChakraCore@7f1ab68
[MERGE #4952 @kfarnung] Set `U_USING_ICU_NAMESPACE` to 0 by default

Merge pull request #4952 from kfarnung:icu61

ICU61 updated the value of `U_USING_ICU_NAMESPACE` to 0 by default. In
order to maintain compatibility this change updates our ICU includes to
match and adds the `icu::` namespace explicitly when needed.

Refs: nodejs/node#18667
Refs: https://ssl.icu-project.org/trac/ticket/13460

Reviewed-By: chakrabot <chakrabot@users.noreply.github.com>

hashseed added a commit to v8/node that referenced this pull request May 18, 2018

deps: ICU 61.1 bump
- Update to released ICU 61.1, including:
  - CLDR 33 (many new languages and data improvements)
  - Many small API additions, improvements, and bug fixes
  - note: 'icu::' namespace is no longer used by default
   (Necessated nodejs#18667 )

PR-URL: nodejs#19621
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@ArchangeGabriel

This comment has been minimized.

Copy link

ArchangeGabriel commented Jun 14, 2018

What is the status for the v8.x backport?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.