The _IntegerConcept, _SignedIntegerConcept and _UnsignedIntegerConcept
class template are specialized for long long, which gives warnings with
-Wsystem-headers in C++98 mode.

libstdc++-v3/ChangeLog:

        * include/bits/boost_concept_check.h: Disable -Wlong-long
        warnings.
        * testsuite/24_iterators/operations/prev_neg.cc: Adjust dg-error
        line number.
---

Tested x86_64-linux.

Pushed to trunk.

 libstdc++-v3/include/bits/boost_concept_check.h            | 1 +
 libstdc++-v3/testsuite/24_iterators/operations/prev_neg.cc | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/bits/boost_concept_check.h 
b/libstdc++-v3/include/bits/boost_concept_check.h
index 7a99f7442cfe..a1f488dd8af1 100644
--- a/libstdc++-v3/include/bits/boost_concept_check.h
+++ b/libstdc++-v3/include/bits/boost_concept_check.h
@@ -68,6 +68,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#pragma GCC diagnostic ignored "-Wlong-long"
 
 #define _IsUnused __attribute__ ((__unused__))
 
diff --git a/libstdc++-v3/testsuite/24_iterators/operations/prev_neg.cc 
b/libstdc++-v3/testsuite/24_iterators/operations/prev_neg.cc
index f9de894be2e5..5fdfa9ec1cb1 100644
--- a/libstdc++-v3/testsuite/24_iterators/operations/prev_neg.cc
+++ b/libstdc++-v3/testsuite/24_iterators/operations/prev_neg.cc
@@ -38,5 +38,5 @@ test02()
 {
   const Y array[1] = { };
   (void) std::prev(array + 1);
-  // { dg-error "forward_iterator" "" { target *-*-* } 241 }
+  // { dg-error "forward_iterator" "" { target *-*-* } 242 }
 }
-- 
2.49.0

Reply via email to