summaryrefslogtreecommitdiffstats
path: root/contrib/libstdc++/src/locale.cc
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2012-10-23 18:45:32 +0000
committerdim <dim@FreeBSD.org>2012-10-23 18:45:32 +0000
commit99da76dc3d08b3012a3cf73037a072d9467d541f (patch)
tree226d9f42be774a1f218b861d3d044261e31f78a6 /contrib/libstdc++/src/locale.cc
parente1bc3b4134d3444ad6395eda2a2cf360b58be705 (diff)
downloadFreeBSD-src-99da76dc3d08b3012a3cf73037a072d9467d541f.zip
FreeBSD-src-99da76dc3d08b3012a3cf73037a072d9467d541f.tar.gz
Fix a number of other clang warnings in libstdc++, which could appear
when building other C++ software with it. Also fix one actual bug in libsupc++, which was exposed by such a warning. This latter fix is the only functional change. MFC after: 1 week
Diffstat (limited to 'contrib/libstdc++/src/locale.cc')
-rw-r--r--contrib/libstdc++/src/locale.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/libstdc++/src/locale.cc b/contrib/libstdc++/src/locale.cc
index 12070eb..a760994 100644
--- a/contrib/libstdc++/src/locale.cc
+++ b/contrib/libstdc++/src/locale.cc
@@ -146,7 +146,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
locale::_S_normalize_category(category __cat)
{
int __ret = 0;
- if (__cat == none || (__cat & all) && !(__cat & ~all))
+ if (__cat == none || ((__cat & all) && !(__cat & ~all)))
__ret = __cat;
else
{
OpenPOWER on IntegriCloud