@@ -932,8 +946,7 @@ namespace pmr
  }

  void
-  __pool_resource::deallocate(void* p, size_t bytes [[maybe_unused]],
-                             size_t alignment [[maybe_unused]])
+  __pool_resource::deallocate(void* p, size_t bytes, size_t alignment)
  {
    const auto it
      = std::lower_bound(_M_unpooled.begin(), _M_unpooled.end(), p);

This part of the change wasn't meant to be committed. Restored with
the attached patch.


commit 90d835c3a0e3fd73b9287ad3b636e13319f38973
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Tue Nov 13 23:01:44 2018 +0000

    Fix unused parameter warnings introduced in earlier patch
    
            * src/c++17/memory_resource.cc (_Pool::deallocate): Restore
            attributes to parameters that are only used in assertions.

diff --git a/libstdc++-v3/src/c++17/memory_resource.cc b/libstdc++-v3/src/c++17/memory_resource.cc
index b553606f552..cb91e5147ce 100644
--- a/libstdc++-v3/src/c++17/memory_resource.cc
+++ b/libstdc++-v3/src/c++17/memory_resource.cc
@@ -940,7 +940,8 @@ namespace pmr
   }
 
   void
-  __pool_resource::deallocate(void* p, size_t bytes, size_t alignment)
+  __pool_resource::deallocate(void* p, size_t bytes [[maybe_unused]],
+			      size_t alignment [[maybe_unused]])
   {
     const auto it
       = std::lower_bound(_M_unpooled.begin(), _M_unpooled.end(), p);

Reply via email to