1150354 - Make nsPluginDirServiceProvider build with MSVC 2015 CTP 6 by dealing with wcstok signature change

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Brian Smith (:briansmith, :bsmith, use NEEDINFO?)]

Attachment: Make nsPluginDirServiceProvider build with MSVC 2015 CTP 6.

MSVC 2013 and earlier provided only a non-standard two-argument
variant of wcstok that is generally not thread-safe. For our
purposes here, it works fine, though, so we polyfill the
standard variant using the non-standard variant.

Comment 1

[Jim Mathies [:jimm]]

Comment on attachment 8587154 [details] [diff] [review]
Make nsPluginDirServiceProvider build with MSVC 2015 CTP 6.

Review of attachment 8587154 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/plugins/base/nsPluginDirServiceProvider.cpp
@@ +122,5 @@
> +  // fine, though.
> +  auto wcstok = [](wchar_t* strToken, const wchar_t* strDelimit,
> +                   wchar_t** /*ctx*/) {
> +    return ::std::wcstok(strToken, strDelimit);
> +  };

First time I've run across this syntax! Pretty neat.

Comment 2

[Brian Smith (:briansmith, :bsmith, use NEEDINFO?)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/9bcb23d1e05f

Thanks for the quick review turnaround!

Comment 3

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/9bcb23d1e05f