Author: dim
Date: Sat Mar 29 11:33:52 2014
New Revision: 263911
URL: http://svnweb.freebsd.org/changeset/base/263911
Log:
MFC r263774:
Revert r263694, and apply a better fix to squelch unnecessary warnings
from clang about possible keywords being treated as identifiers for the
remainder of the translation unit (a.k.a. -Wkeyword-compat), when using
libstdc++ in combination with -Wsystem-headers. This will not only fix
devd, but any C++ program using libstdc++.
Modified:
stable/9/contrib/libstdc++/include/bits/cpp_type_traits.h
stable/9/sbin/devd/Makefile
Directory Properties:
stable/9/contrib/libstdc++/ (props changed)
stable/9/sbin/devd/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/contrib/libstdc++/include/bits/cpp_type_traits.h
stable/10/sbin/devd/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/9/contrib/libstdc++/include/bits/cpp_type_traits.h
==============================================================================
--- stable/9/contrib/libstdc++/include/bits/cpp_type_traits.h Sat Mar 29
10:11:19 2014 (r263910)
+++ stable/9/contrib/libstdc++/include/bits/cpp_type_traits.h Sat Mar 29
11:33:52 2014 (r263911)
@@ -80,6 +80,13 @@ _GLIBCXX_END_NAMESPACE
_GLIBCXX_BEGIN_NAMESPACE(std)
+#ifdef __clang__
+// When using clang, suppress warnings about possible keywords (such as
+// __is_void, __is_pod, etc) being used as identifiers.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wkeyword-compat"
+#endif
+
namespace __detail
{
// NB: g++ can not compile these if declared within the class
@@ -398,6 +405,10 @@ namespace __detail
};
#endif
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
_GLIBCXX_END_NAMESPACE
#endif //_CPP_TYPE_TRAITS_H
Modified: stable/9/sbin/devd/Makefile
==============================================================================
--- stable/9/sbin/devd/Makefile Sat Mar 29 10:11:19 2014 (r263910)
+++ stable/9/sbin/devd/Makefile Sat Mar 29 11:33:52 2014 (r263911)
@@ -13,7 +13,6 @@ LDADD= -ll -lutil
YFLAGS+=-v
CFLAGS+=-I. -I${.CURDIR}
-CFLAGS.clang+=-Wno-keyword-compat
CLEANFILES= y.output
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
