libcxx with Visual C++ : don't redefine _NOEXCEPT when already defined

[G M]

Hi everyone (sorry for the late reply, I've been on holiday)

Regarding the  _NOEXCEPT macro and it's interaction with MSVC's version of
it, mentioned by yaron here:

On Fri, Dec 27, 2013 at 1:52 AM, Yaron Keren <yaron.keren at gmail.com> wrote:

> With Visual C++ __config redefines _NOEXCEPT resulting in a warning:
>
> ibcxx\include\__config(434) : warning C4005: '_NOEXCEPT' : macro
> redefinition
>         C:\Program Files (x86)\Microsoft Visual Studio
> 12.0\VC\INCLUDE\yvals.h(25) : see previous definition of '_NOEXCEPT'
>
>  I checked and at least Visual C++ 2012, 2013 define _NOEXCEPT in yvals.h.
>
> This patch #ifndef _NOEXCEPT to avoid the warning.
>
> Alternative solution could be to remove it completely, as Visual C++ seems
> to supply it. Maybe it was for an older version of Visual C++.
>
> Yaron
>
>
I actually submitted a "fix" for this myself sometime ago but it seems it
got "lost".

MSVC's yvals.h (or something like that) defines _NOEXCEPT as the same thing
except for spacing.

My previously submitted solution which I'm attaching here again, is just to
change libcxx's definition to exactly match (i.e. the white space) MS's
definition that MS's yvals.h uses.

This stops MSVC from complaining about duplicate definitions when yvals.h
is included after __config and effectively removes 100's of warnings for
the msvc build of libcxx.

I can't see any risk to libcxx here on other platforms.

There weren't any objections when I submitted this patch before, it was
just forgotten. Any objections to this patch this time?

Thanks
PS As a suggestion: It'd be great if the _NOEXCEPT_ macro (as opposed to
the one without a trailing _) in libcxx's __config header had a different
name. It's too close to _NOEXCEPT and an easy mistake make. MS use
_NOEXCEPT_OP instead for _NOEXCEPT_ which I think that's much clearer. A
mechanical tool could perhaps be used to make this change? I imagine
there's no will to do this though. Just a suggestion anyway.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140106/4fce61d0/attachment.html>
-------------- next part --------------
Index: __config
===================================================================
--- __config	(revision 198582)
+++ __config	(working copy)
@@ -434,7 +434,7 @@
 #define _ALIGNAS(x) __declspec(align(x))
 #define _LIBCPP_HAS_NO_VARIADICS
 
-#define _NOEXCEPT throw()
+#define _NOEXCEPT throw ()
 #define _NOEXCEPT_(x)
 #define _NOEXCEPT_OR_FALSE(x) false