[Libreoffice-commits] core.git: external/boost

Stephan Bergmann sbergman at redhat.com
Wed May 11 07:45:12 UTC 2016


 external/boost/fallthrough.patch.0 |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 4e8a0a75f46356639ac9e00086e2ec9b9f333c77
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 11 09:44:40 2016 +0200

    Missing include
    
    Change-Id: If7abf2ad3ac738e7103491e38a0e53ba424f5550

diff --git a/external/boost/fallthrough.patch.0 b/external/boost/fallthrough.patch.0
index f8985bd..02b09dc 100644
--- a/external/boost/fallthrough.patch.0
+++ b/external/boost/fallthrough.patch.0
@@ -1,6 +1,14 @@
 --- boost/format/parsing.hpp
 +++ boost/format/parsing.hpp
-@@ -267,6 +267,7 @@
+@@ -19,6 +19,7 @@
+ #include <boost/format/exceptions.hpp>
+ #include <boost/throw_exception.hpp>
+ #include <boost/assert.hpp>
++#include <boost/config.hpp>
+ 
+ 
+ namespace boost {
+@@ -267,6 +268,7 @@
          switch ( wrap_narrow(fac, *start, 0) ) {
          case 'X':
              fpar->fmtstate_.flags_ |= std::ios_base::uppercase;
@@ -8,7 +16,7 @@
          case 'p': // pointer => set hex.
          case 'x':
              fpar->fmtstate_.flags_ &= ~std::ios_base::basefield;
-@@ -280,6 +281,7 @@
+@@ -280,6 +282,7 @@
  
          case 'E':
              fpar->fmtstate_.flags_ |=  std::ios_base::uppercase;
@@ -16,7 +24,7 @@
          case 'e':
              fpar->fmtstate_.flags_ &= ~std::ios_base::floatfield;
              fpar->fmtstate_.flags_ |=  std::ios_base::scientific;
-@@ -291,6 +293,7 @@
+@@ -291,6 +294,7 @@
          case 'f':
              fpar->fmtstate_.flags_ &= ~std::ios_base::floatfield;
              fpar->fmtstate_.flags_ |=  std::ios_base::fixed;


More information about the Libreoffice-commits mailing list