merge.hpp in passenger-6.0.23

- old
+ new

@@ -41,15 +41,15 @@
 
    public:
    typedef RandRawIt iterator;
    typedef SizeType  size_type;
 
-   BOOST_MOVE_FORCEINLINE adaptive_xbuf()
+   inline adaptive_xbuf()
       : m_ptr(), m_size(0), m_capacity(0)
    {}
 
-   BOOST_MOVE_FORCEINLINE adaptive_xbuf(RandRawIt raw_memory, size_type cap)
+   inline adaptive_xbuf(RandRawIt raw_memory, size_type cap)
       : m_ptr(raw_memory), m_size(0), m_capacity(cap)
    {}
 
    template<class RandIt>
    void move_assign(RandIt first, size_type n)
@@ -100,11 +100,11 @@
          boost::move_backward(pos, m_ptr+m_size-2, m_ptr+m_size-1);
          *pos = boost::move(*it);
       }
    }
 
-   BOOST_MOVE_FORCEINLINE void set_size(size_type sz)
+   inline void set_size(size_type sz)
    {
       m_size = sz;
    }
 
    void shrink_to_fit(size_type const sz)
@@ -142,16 +142,16 @@
       }
    }
 
    private:
    template<class RIt>
-   BOOST_MOVE_FORCEINLINE static bool is_raw_ptr(RIt)
+   inline static bool is_raw_ptr(RIt)
    {
       return false;
    }
 
-   BOOST_MOVE_FORCEINLINE static bool is_raw_ptr(T*)
+   inline static bool is_raw_ptr(T*)
    {
       return true;
    }
 
    public:
@@ -166,46 +166,46 @@
       }
       return false;
    }
 
    template<class U>
-   BOOST_MOVE_FORCEINLINE U *aligned_trailing() const
+   inline U *aligned_trailing() const
    {
       return this->aligned_trailing<U>(this->size());
    }
 
    template<class U>
-   BOOST_MOVE_FORCEINLINE U *aligned_trailing(size_type pos) const
+   inline U *aligned_trailing(size_type pos) const
    {
       uintptr_t u_addr = uintptr_t(&*(this->data()+pos));
       u_addr = ((u_addr + sizeof(U)-1)/sizeof(U))*sizeof(U);
       return (U*)u_addr;
    }
 
-   BOOST_MOVE_FORCEINLINE ~adaptive_xbuf()
+   inline ~adaptive_xbuf()
    {
       this->clear();
    }
 
-   BOOST_MOVE_FORCEINLINE size_type capacity() const
+   inline size_type capacity() const
    {  return m_capacity;   }
 
-   BOOST_MOVE_FORCEINLINE iterator data() const
+   inline iterator data() const
    {  return m_ptr;   }
 
-   BOOST_MOVE_FORCEINLINE iterator begin() const
+   inline iterator begin() const
    {  return m_ptr;   }
 
-   BOOST_MOVE_FORCEINLINE iterator end() const
+   inline iterator end() const
    {  return m_ptr+m_size;   }
 
-   BOOST_MOVE_FORCEINLINE size_type size() const
+   inline size_type size() const
    {  return m_size;   }
 
-   BOOST_MOVE_FORCEINLINE bool empty() const
+   inline bool empty() const
    {  return !m_size;   }
 
-   BOOST_MOVE_FORCEINLINE void clear()
+   inline void clear()
    {
       this->shrink_to_fit(0u);
    }
 
    private: