[Libreoffice-commits] .: 2 commits - boost/boost.6397.warnings.patch framework/source

[Libreoffice Gerrit user]

 boost/boost.6397.warnings.patch            |   66 +++++++++++++++++++++++++++++
 framework/source/services/autorecovery.cxx |   12 +----
 2 files changed, 70 insertions(+), 8 deletions(-)

New commits:
commit 22238981b9f271d75f4d4c8b39b56cbc3616bff2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Oct 21 17:14:53 2012 +0100

    some additional clang warnings
    
    Change-Id: I7ba4a6cb9ad8cb75282553d486e48c00e19cc0c2

diff --git a/boost/boost.6397.warnings.patch b/boost/boost.6397.warnings.patch
index 9c4c1ec..380dfbc 100644
--- a/boost/boost.6397.warnings.patch
+++ b/boost/boost.6397.warnings.patch
@@ -257,6 +257,72 @@
  
 --- misc/boost_1_44_0/boost/multi_array.hpp	2012-09-28 13:06:44.796521371 +0100
 +++ misc/build/boost_1_44_0/boost/multi_array.hpp	2012-09-28 13:07:25.119002500 +0100
+@@ -139,20 +139,20 @@
+ 
+   explicit multi_array() :
+     super_type((T*)initial_base_,c_storage_order(),
+-               /*index_bases=*/0, /*extents=*/0) {
++               /*index_bases=*/0, /*extents_=*/0) {
+     allocate_space(); 
+   }
+ 
+   template <class ExtentList>
+   explicit multi_array(
+-      ExtentList const& extents
++      ExtentList const& extents_
+ #ifdef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
+       , typename mpl::if_<
+       detail::multi_array::is_multi_array_impl<ExtentList>,
+       int&,int>::type* = 0
+ #endif
+       ) :
+-    super_type((T*)initial_base_,extents) {
++    super_type((T*)initial_base_,extents_) {
+     boost::function_requires<
+       detail::multi_array::CollectionConcept<ExtentList> >();
+     allocate_space();
+@@ -160,19 +160,19 @@
+ 
+     
+   template <class ExtentList>
+-  explicit multi_array(ExtentList const& extents,
++  explicit multi_array(ExtentList const& extents_,
+                        const general_storage_order<NumDims>& so) :
+-    super_type((T*)initial_base_,extents,so) {
++    super_type((T*)initial_base_,extents_,so) {
+     boost::function_requires<
+       detail::multi_array::CollectionConcept<ExtentList> >();
+     allocate_space();
+   }
+ 
+   template <class ExtentList>
+-  explicit multi_array(ExtentList const& extents,
++  explicit multi_array(ExtentList const& extents_,
+                        const general_storage_order<NumDims>& so,
+                        Allocator const& alloc) :
+-    super_type((T*)initial_base_,extents,so), allocator_(alloc) {
++    super_type((T*)initial_base_,extents_,so), allocator_(alloc) {
+     boost::function_requires<
+       detail::multi_array::CollectionConcept<ExtentList> >();
+     allocate_space();
+@@ -381,7 +381,7 @@
+ 
+ 
+   template <typename ExtentList>
+-  multi_array& resize(const ExtentList& extents) {
++  multi_array& resize(const ExtentList& extents_) {
+     boost::function_requires<
+       detail::multi_array::CollectionConcept<ExtentList> >();
+ 
+@@ -390,7 +390,7 @@
+ 
+     for (int i=0; i != NumDims; ++i) {
+       typedef typename gen_type::range range_type;
+-      ranges.ranges_[i] = range_type(0,extents[i]);
++      ranges.ranges_[i] = range_type(0,extents_[i]);
+     }
+     
+     return this->resize(ranges);
 @@ -423,9 +423,9 @@
      // Build index_gen objects to create views with the same shape
  
commit 3b76773b0e38830ac16cbbb54848d75c5fea4f1c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Oct 21 17:07:58 2012 +0100

    loplugin: misleading else if indent

diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 43fd47c..a5efae1 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2534,8 +2534,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
             rInfo.DocumentState |= AutoRecovery::E_TRY_LOAD_BACKUP;
             lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= sLoadOriginalURL;
         }
-        else
-        if (!sLoadOriginalURL.isEmpty())
+        else if (!sLoadOriginalURL.isEmpty())
         {
             sURL = sLoadOriginalURL;
             rInfo.DocumentState |= AutoRecovery::E_TRY_LOAD_ORIGINAL;
@@ -2780,8 +2779,7 @@ void AutoRecovery::implts_generateNewTempURL(const ::rtl::OUString&
         xParser->parseStrict(aURL);
         sUniqueName.append(aURL.Name);
     }
-    else
-    if (!rInfo.FactoryURL.isEmpty())
+    else if (!rInfo.FactoryURL.isEmpty())
         sUniqueName.appendAscii("untitled");
     sUniqueName.appendAscii("_");
 
@@ -3168,11 +3166,9 @@ void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams)
         // Prefer temp file. It contains the changes against the original document!
         if (!rInfo.OldTempURL.isEmpty())
             sSourceURL = rInfo.OldTempURL;
-        else
-        if (!rInfo.NewTempURL.isEmpty())
+        else if (!rInfo.NewTempURL.isEmpty())
             sSourceURL = rInfo.NewTempURL;
-        else
-        if (!rInfo.OrgURL.isEmpty())
+        else if (!rInfo.OrgURL.isEmpty())
             sSourceURL = rInfo.OrgURL;
         else
             continue; // nothing real to save! An unmodified but new created document.