Ticket #9170: boost_addressof_forceinline.diff

boost/utility/addressof.hpp

@@ -25 +25 @@
 {
     T & v_;
 
-    inline addr_impl_ref( T & v ): v_( v ) {}
-    inline operator T& () const { return v_; }
+    BOOST_FORCEINLINE addr_impl_ref( T & v ): v_( v ) {}
+    BOOST_FORCEINLINE operator T& () const { return v_; }
 
 private:
     addr_impl_ref & operator=(const addr_impl_ref &);
@@ -34 +34 @@
 
 template<class T> struct addressof_impl
 {
-    static inline T * f( T & v, long )
+    static BOOST_FORCEINLINE T * f( T & v, long )
     {
         return reinterpret_cast<T*>(
             &const_cast<char&>(reinterpret_cast<const volatile char &>(v)));
     }
 
-    static inline T * f( T * v, int )
+    static BOOST_FORCEINLINE T * f( T * v, int )
     {
         return v;
     }
@@ -48 +48 @@
 
 } // namespace detail
 
-template<class T> T * addressof( T & v )
+template<class T>
+BOOST_FORCEINLINE
+T * addressof( T & v )
 {
 #if (defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x610 ) ) ) || defined( __SUNPRO_CC )
 
@@ -74 +76 @@
 } // namespace detail
 
 template< class T, std::size_t N >
+BOOST_FORCEINLINE
 typename detail::addressof_addp< T[N] >::type addressof( T (&t)[N] )
 {
     return &t;
@@ -85 +88 @@
 // but these overloads work around the problem.
 #if defined( __BORLANDC__ ) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 template<typename T,std::size_t N>
+BOOST_FORCEINLINE
 T (*addressof(T (&t)[N]))[N]
 {
    return reinterpret_cast<T(*)[N]>(&t);
 }
 
 template<typename T,std::size_t N>
+BOOST_FORCEINLINE
 const T (*addressof(const T (&t)[N]))[N]
 {
    return reinterpret_cast<const T(*)[N]>(&t);