[boost] [git] mode and whitespace changes remaining between develop and master

Subject: [boost] [git] mode and whitespace changes remaining between develop and master
From: Nathan Ridge (zeratul976_at_[hidden])
Date: 2013-12-30 05:08:52

Hello,

I am trying to follow the instructions for "Establishing a merge point 
after SVN Conversion" [1] for the Boost.Range library.

After cherry-picking all the commits to develop that have not been 
merged to master, onto master (all locally, I have not pushed
anything yet), I am finding that there are still some mode and
whitespace differences between master and develop (see the diff at 
the bottom of the message). I cannot find the commits that are 
responsible for these changes - is it safe to just ignore them?

Thanks,
Nate

[1] https://svn.boost.org/trac/boost/wiki/PostCvtMergePoint

diff --git a/include/boost/range.hpp b/include/boost/range.hpp
old mode 100755
new mode 100644
diff --git a/include/boost/range/adaptor/strided.hpp b/include/boost/range/adaptor/strided.hpp
old mode 100644
new mode 100755
diff --git a/include/boost/range/adaptor/transformed.hpp b/include/boost/range/adaptor/transformed.hpp
old mode 100644
new mode 100755
diff --git a/include/boost/range/algorithm_ext/is_sorted.hpp b/include/boost/range/algorithm_ext/is_sorted.hpp
old mode 100644
new mode 100755
diff --git a/include/boost/range/detail/demote_iterator_traversal_tag.hpp b/include/boost/range/detail/demote_iterator_traversal_tag.hpp
old mode 100644
new mode 100755
diff --git a/include/boost/range/detail/implementation_help.hpp b/include/boost/range/detail/implementation_help.hpp
old mode 100644
new mode 100755
index 1f7d163..ca12fa4
--- a/include/boost/range/detail/implementation_help.hpp
+++ b/include/boost/range/detail/implementation_help.hpp
@@ -21,13 +21,13 @@
 #include <wchar.h>
 #endif

-namespace boost
+namespace boost
 {
     namespace range_detail
     {
         template <typename T>
         inline void boost_range_silence_warning( const T& ) { }
-
+
         /////////////////////////////////////////////////////////////////////
         // end() help
         /////////////////////////////////////////////////////////////////////
@@ -36,7 +36,7 @@ namespace boost
         {
             return s + strlen( s );
         }
-
+
 #ifndef BOOST_NO_CWCHAR
         inline const wchar_t* str_end( const wchar_t* s, const wchar_t* )
         {
@@ -51,7 +51,7 @@ namespace boost
                 ;
             return s;
         }
-#endif
+#endif

         template< class Char>
         inline Char* str_end( Char* s )
@@ -64,7 +64,7 @@ namespace boost
         {
             return boost_range_array + sz;
         }
-
+
         template< class T, std::size_t sz>
         inline const T* array_end( const T BOOST_RANGE_ARRAY_REF()[sz] )
         {
@@ -74,7 +74,7 @@ namespace boost
         /////////////////////////////////////////////////////////////////////
         // size() help
         /////////////////////////////////////////////////////////////////////
-
+
         template< class Char>
         inline std::size_t str_size( const Char* const& s )
         {
@@ -96,7 +96,7 @@ namespace boost
         }

     } // namespace 'range_detail'
-
+
 } // namespace 'boost'


diff --git a/include/boost/range/iterator.hpp b/include/boost/range/iterator.hpp
index 4ba9122..2966bdf 100644
--- a/include/boost/range/iterator.hpp
+++ b/include/boost/range/iterator.hpp
@@ -25,46 +25,46 @@
 namespace boost
 {

-#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
-
-    namespace range_detail_vc7_1
-    {
-       template< typename C, typename Sig = void(C)>
-       struct range_iterator
-       {
-           typedef BOOST_RANGE_DEDUCED_TYPENAME
-               mpl::eval_if_c< is_const<C>::value,
-                               range_const_iterator< typename remove_const<C>::type>,
-                               range_mutable_iterator<C>>::type type;
-       };
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)

-       template< typename C, typename T>
-       struct range_iterator< C, void(T[])>
-       {
-           typedef T* type;
-       };
-    }
-
-#endif
+    namespace range_detail_vc7_1
+    {
+       template< typename C, typename Sig = void(C)>
+       struct range_iterator
+       {
+           typedef BOOST_RANGE_DEDUCED_TYPENAME
+               mpl::eval_if_c< is_const<C>::value,
+                               range_const_iterator< typename remove_const<C>::type>,
+                               range_mutable_iterator<C>>::type type;
+       };
+
+       template< typename C, typename T>
+       struct range_iterator< C, void(T[])>
+       {
+           typedef T* type;
+       };
+    }
+
+#endif

     template< typename C>
     struct range_iterator
     {
 #if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
+
+        typedef BOOST_RANGE_DEDUCED_TYPENAME
+               range_detail_vc7_1::range_iterator<C>::type type;
+
+#else

-        typedef BOOST_RANGE_DEDUCED_TYPENAME
-               range_detail_vc7_1::range_iterator<C>::type type;
-
-#else
-
-        typedef BOOST_RANGE_DEDUCED_TYPENAME
-            mpl::eval_if_c< is_const<C>::value,
+        typedef BOOST_RANGE_DEDUCED_TYPENAME
+            mpl::eval_if_c< is_const<C>::value,
                             range_const_iterator< typename remove_const<C>::type>,
                             range_mutable_iterator<C>>::type type;
-
-#endif
+
+#endif
     };
-
+
 } // namespace boost

 #endif