[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  abdc8b55b462e1c827d005a961fef00dc7af42c0 (commit)
      from  65f5738603391b1e4dbfc2c40077a95db6f093e8 (commit)

Summary of changes:
 src/OperationMonitor.h |   30 +++++++++++++++---------------
 src/ServiceUtil.h      |    4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)


- Log -----------------------------------------------------------------
commit abdc8b55b462e1c827d005a961fef00dc7af42c0
Author: Brent Eagles <beagles at digium.com>
Date:   Wed Mar 21 18:57:37 2012 -0230

    Some fixes for building on Linux.

diff --git a/src/OperationMonitor.h b/src/OperationMonitor.h
index df1de93..0bf2dfa 100755
--- a/src/OperationMonitor.h
+++ b/src/OperationMonitor.h
@@ -178,8 +178,8 @@ class AMDContextData : public ContextData,
     public virtual boost::enable_shared_from_this<AMDContextData<CB> >
 {
 public:
-    template<class CB >
-    class AMDProxy : virtual public CB::element_type, virtual public IceUtil::Shared
+    template<class T >
+    class AMDProxy : virtual public T::element_type, virtual public IceUtil::Shared
     {
     public:
         void ice_response()
@@ -224,7 +224,7 @@ public:
             }
         }
 
-        AMDProxy(const boost::shared_ptr<AMDContextData<CB> >& d) :
+        AMDProxy(const boost::shared_ptr<AMDContextData<T> >& d) :
             mParent(d)
         {
         }
@@ -235,7 +235,7 @@ public:
         }
 
     private:
-        boost::shared_ptr<AMDContextData<CB> > mParent;
+        boost::shared_ptr<AMDContextData<T> > mParent;
     };
 
     AMDContextData() {}
@@ -292,7 +292,7 @@ void AMDContextData<CB>::addCB(const CB& cbPtr)
 template <class CB>
 void AMDContextData<CB>::onSetException()
 {
-    for (std::vector<CB>::const_iterator iter= mCallbacks.begin();
+    for (typename std::vector<CB>::const_iterator iter= mCallbacks.begin();
          iter != mCallbacks.end(); ++iter)
     {
         (*iter)->ice_exception(*(mExceptionResult->exception()));
@@ -302,7 +302,7 @@ void AMDContextData<CB>::onSetException()
 template <class CB>
 void AMDContextData<CB>::onSetCompleted()
 {
-    for (std::vector<CB>::const_iterator iter= mCallbacks.begin();
+    for (typename std::vector<CB>::const_iterator iter= mCallbacks.begin();
          iter != mCallbacks.end(); ++iter)
     {
         (*iter)->ice_response();
@@ -324,11 +324,11 @@ class AMDContextResultData : public ContextResultData<RT>,
     public virtual boost::enable_shared_from_this<AMDContextResultData<RT, CB> >
 {
 public:
-    template< typename RT, class CB >
-    class AMDProxy : virtual public CB::element_type, virtual public IceUtil::Shared
+    template< typename RTi, class CBi >
+    class AMDProxy : virtual public CBi::element_type, virtual public IceUtil::Shared
     {
     public:
-        void ice_response(const RT& result)
+        void ice_response(const RTi& result)
         {
             if (mParent)
             {
@@ -370,20 +370,20 @@ public:
             }
         }
 
-        AMDProxy(const boost::shared_ptr<AMDContextResultData<RT, CB> >& d) :
+        AMDProxy(const boost::shared_ptr<AMDContextResultData<RTi, CBi> >& d) :
             mParent(d)
         {
         }
 
     private:
-        boost::shared_ptr<AMDContextResultData<RT, CB> > mParent;
+        boost::shared_ptr<AMDContextResultData<RTi, CBi> > mParent;
     };
 
     AMDContextResultData()
     {
     }
 
-    AMDContextResultData(const CB& cb) :
+    AMDContextResultData(const CB& cb)
     {
         mCallbacks.push_back(cb);
     }
@@ -436,7 +436,7 @@ void AMDContextResultData<RT, CB>::addCB(const CB& cbPtr)
 template <typename RT, class CB>
 void AMDContextResultData<RT, CB>::onSetResult()
 {
-    for (std::vector<CB>::const_iterator iter = mCallbacks.begin();
+    for (typename std::vector<CB>::const_iterator iter = mCallbacks.begin();
          iter != mCallbacks.end(); ++iter)
     {
         (*iter)->ice_response(mResult);
@@ -445,7 +445,7 @@ void AMDContextResultData<RT, CB>::onSetResult()
 template <typename RT, class CB>
 void AMDContextResultData<RT, CB>::onSetException()
 {
-    for (std::vector<CB>::const_iterator iter= mCallbacks.begin();
+    for (typename std::vector<CB>::const_iterator iter= mCallbacks.begin();
          iter != mCallbacks.end(); ++iter)
     {
         (*iter)->ice_exception(*(mExceptionResult->exception()));
@@ -475,7 +475,7 @@ DT getContext(const AsteriskSCF::Operations::OperationContextCachePtr& cache,
      
     if (!cache->addOperationContext(context, c, o))
     {
-        c = dynamic_pointer_cast<DT::element_type>(o);
+        c = boost::dynamic_pointer_cast<DT::element_type>(o);
         assert(c);
         c->addCB(amdCallback);
         return DT();
diff --git a/src/ServiceUtil.h b/src/ServiceUtil.h
index 1815ec5..dfb0bfc 100644
--- a/src/ServiceUtil.h
+++ b/src/ServiceUtil.h
@@ -55,7 +55,7 @@ public:
                     management->addService(mService, mName));
             if(mServiceManagement)
             {
-                mServiceManagement->addLocatorParams(AsteriskSCF::createContext(), mParameters, "");
+                mServiceManagement->addLocatorParams(AsteriskSCF::Operations::createContext(), mParameters, "");
                 return true;
             }
         }
@@ -71,7 +71,7 @@ public:
                 return;
             }
         }
-        mServiceManagement->unregister();
+        mServiceManagement->unregister(AsteriskSCF::Operations::createContext());
     }
 
 private:

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/bridging.git