[Boost-commit] svn:boost r60751 - sandbox/transaction/boost/transact

Subject: [Boost-commit] svn:boost r60751 - sandbox/transaction/boost/transact
From: vicente.botet_at_[hidden]
Date: 2010-03-21 13:15:15

Author: viboes
Date: 2010-03-21 13:15:15 EDT (Sun, 21 Mar 2010)
New Revision: 60751
URL: http://svn.boost.org/trac/boost/changeset/60751

Log:
Boost.Transact: 
* Change friend template syntax to standard C++
* Remove the use of BOOST_NO_MEMBER_TEMPLATE_FRIENDS as this is for very old compilers

Text files modified: 
   sandbox/transaction/boost/transact/basic_transaction_manager.hpp  |     2 ++                                      
   sandbox/transaction/boost/transact/simple_transaction_manager.hpp |    12 ++----------                            
   2 files changed, 4 insertions(+), 10 deletions(-)

Modified: sandbox/transaction/boost/transact/basic_transaction_manager.hpp
==============================================================================
--- sandbox/transaction/boost/transact/basic_transaction_manager.hpp	(original)
+++ sandbox/transaction/boost/transact/basic_transaction_manager.hpp	2010-03-21 13:15:15 EDT (Sun, 21 Mar 2010)
@@ -156,6 +156,7 @@
                 class transaction_construct_t{
                         explicit transaction_construct_t(transaction *parent)
                                 : parent(parent){}
+			template<class R,bool Th,bool TTh,class L> 
                         friend class basic_transaction_manager;
                         transaction *parent;
                 };
@@ -166,6 +167,7 @@
                                 mpl::for_each<resource_tags>(beginner(*this));
                         }
                 private:
+			template<class R,bool Th,bool TTh,class L> 
                         friend class basic_transaction_manager;
         
                         template<class Resource>

Modified: sandbox/transaction/boost/transact/simple_transaction_manager.hpp
==============================================================================
--- sandbox/transaction/boost/transact/simple_transaction_manager.hpp	(original)
+++ sandbox/transaction/boost/transact/simple_transaction_manager.hpp	2010-03-21 13:15:15 EDT (Sun, 21 Mar 2010)
@@ -33,12 +33,8 @@
                 class transaction_construct_t{
                         explicit transaction_construct_t(transaction *parent)
                                 : parent(parent){}
-#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-            template <class R, bool Th> friend class simple_transaction_manager;
-            friend class transaction;
-#else    
-        public:  // Should be private
-#endif
+			template <class R, bool Th> friend class simple_transaction_manager;
+			friend class transaction;
                         transaction *parent;
                 };
 
@@ -55,11 +51,7 @@
                                 }
                         }
                 private:
-#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
                         template <class R, bool Th> friend class simple_transaction_manager;
-#else    
-        public:  // Should be private
-#endif
                         optional<typename Resource::transaction> rtx;
                         transaction * const parent;
                 };