From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 6FDF5382E82D; Tue, 23 Feb 2021 08:28:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6FDF5382E82D MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-7339] libstdc++: Fix up parallel_backend_serial.h [PR97549] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: f4a3cea3fb025735c09af5c7f14d61152c4c5794 X-Git-Newrev: 7e647d71d556b73e84f4edd0733bcc83bc70ae1e Message-Id: <20210223082826.6FDF5382E82D@sourceware.org> Date: Tue, 23 Feb 2021 08:28:26 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Feb 2021 08:28:26 -0000 https://gcc.gnu.org/g:7e647d71d556b73e84f4edd0733bcc83bc70ae1e commit r11-7339-g7e647d71d556b73e84f4edd0733bcc83bc70ae1e Author: Jakub Jelinek Date: Tue Feb 23 09:26:23 2021 +0100 libstdc++: Fix up parallel_backend_serial.h [PR97549] In GCC 10, parallel_backend.h just included parallel_backend_{serial,tbb}.h and did nothing beyond that, and parallel_backend_tbb.h provided directly namespace __pstl { namespace __par_backend { ... } } and defined everything in there, while parallel_backend_serial.h did: namespace __pstl { namespace __serial { ... } } and had this namespace __pstl { namespace __par_backend { using namespace __pstl::__serial; } } at the end. In GCC 11, parallel_backend.h does: namespace __pstl { namespace __par_backend = __serial_backend; } after including parallel_backend_serial.h or namespace __pstl { namespace __par_backend = __tbb_backend; } after including parallel_backend_tbb.h. The latter then has: namespace __pstl { namespace __tbb_backend { ... } } and no using etc. at the end, while parallel_backend_serial.h changed to: namespace __pstl { namespace __serial_backend { ... } } but has this leftover block from the GCC 10 times. Even changing that using namespace __pstl::__serial; to using namespace __pstl::__serial_backend; doesn't work, as it clashes with namespace __pstl { namespace __par_backend = __serial_backend; } in parallel_backend.h. 2021-02-23 Jakub Jelinek PR libstdc++/97549 * include/pstl/parallel_backend_serial.h: Remove __pstl::__par_backend. Diff: --- libstdc++-v3/include/pstl/parallel_backend_serial.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libstdc++-v3/include/pstl/parallel_backend_serial.h b/libstdc++-v3/include/pstl/parallel_backend_serial.h index 32abe77321e..16e773d411a 100644 --- a/libstdc++-v3/include/pstl/parallel_backend_serial.h +++ b/libstdc++-v3/include/pstl/parallel_backend_serial.h @@ -127,12 +127,4 @@ __parallel_invoke(_ExecutionPolicy&&, _F1&& __f1, _F2&& __f2) } // namespace __serial_backend } // namespace __pstl -namespace __pstl -{ -namespace __par_backend -{ -using namespace __pstl::__serial; -} -} // namespace __pstl - #endif /* _PSTL_PARALLEL_BACKEND_SERIAL_H */