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

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Wed Aug 18 15:05:45 CDT 2010


branch "master" has been updated
       via  dd500675956796f68548d5e58856246ea8030992 (commit)
       via  b6cf0745e0b4cece99d3a22688c1952fb95e0d1b (commit)
      from  9e6083851eba7c875d8102dd6b5ac9fa693339a5 (commit)

Summary of changes:
 src/BridgeFactoryImpl.cpp |    1 +
 src/BridgeImpl.cpp        |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)


- Log -----------------------------------------------------------------
commit dd500675956796f68548d5e58856246ea8030992
Merge: b6cf074 9e60838
Author: Brent Eagles <beagles at digium.com>
Date:   Wed Aug 18 17:29:17 2010 -0230

    Merge branch 'master' of ssh://git.asterisk.org/asterisk-scf/integration/bridging


commit b6cf0745e0b4cece99d3a22688c1952fb95e0d1b
Author: Brent Eagles <beagles at digium.com>
Date:   Wed Aug 18 17:27:43 2010 -0230

    Fix a boost include issue under windows builds.

diff --git a/src/BridgeFactoryImpl.cpp b/src/BridgeFactoryImpl.cpp
index 71cb584..09f2372 100644
--- a/src/BridgeFactoryImpl.cpp
+++ b/src/BridgeFactoryImpl.cpp
@@ -1,5 +1,6 @@
 #include "BridgeFactoryImpl.h"
 #include <Ice/Ice.h>
+#include <boost/thread/locks.hpp>
 
 namespace Hydra
 {
diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index 356e7c6..32e03b1 100644
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -2,6 +2,7 @@
 #include <System/Component/ComponentServiceIf.h>
 #include <Ice/Ice.h>
 #include <memory>
+#include <boost/thread/locks.hpp>
 
 //
 // TODO:

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


-- 
asterisk-scf/integration/bridging.git



More information about the asterisk-scf-commits mailing list