[Libreoffice-commits] core.git: sdext/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Wed Jan 13 16:54:26 UTC 2021


 sdext/source/pdfimport/pdfparse/pdfparse.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 58a61c0b85d8e1f08922a3ccedfa6101f4bf587a
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jan 13 14:32:24 2021 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jan 13 17:53:38 2021 +0100

    Silence Boost bind deprecation warning
    
    > In file included from sdext/source/pdfimport/pdfparse/pdfparse.cxx:35:
    > In file included from external/boost/include/boost/bind.hpp:30:
    > workdir/UnpackedTarball/boost/boost/bind.hpp:36:1: warning: The practice of declaring the Bind placeholders (_1, _2, ...) in the global namespace is deprecated. Please use <boost/bind/bind.hpp> + using namespace boost::placeholders, or define BOOST_BIND_GLOBAL_PLACEHOLDERS to retain the current behavior. [-W#pragma-messages]
    > BOOST_PRAGMA_MESSAGE(
    > ^
    
    since e0f1b5bd94550835c639efda4e4c9a801c78dbe9 "Upgrade external/boost to latest
    Boost 1.75.0".  boost/bind/bind.hpp and boost::placeholders appear to date back
    to before our Boost 1.66 baseline.
    
    Change-Id: I766be46fca02693fe0114c7c5855e6d94f7860a4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109228
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index e61d900885ea..ef0bfaea65f4 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -32,7 +32,7 @@
 #include <boost/spirit/include/classic_utility.hpp>
 #include <boost/spirit/include/classic_error_handling.hpp>
 #include <boost/spirit/include/classic_file_iterator.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <string.h>
 
@@ -143,6 +143,8 @@ public:
     {
         explicit definition( const PDFGrammar<iteratorT>& rSelf )
         {
+            using namespace boost::placeholders;
+
             PDFGrammar<iteratorT>* pSelf = const_cast< PDFGrammar<iteratorT>* >( &rSelf );
 
             // workaround workshop compiler: comment_p doesn't work


More information about the Libreoffice-commits mailing list