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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  d9ab0dfb914985f157385625343ea3ce59e56d28 (commit)
      from  141dd3fdd338e19af21791c8306d952cf4a8d8b2 (commit)

Summary of changes:
 test/TestBridging.cpp |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit d9ab0dfb914985f157385625343ea3ce59e56d28
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Jan 3 14:55:00 2012 -0600

    Use different syntax for initializing structs.
    
    Old versions of GCC did not like what I was doing. Neither did VS2010.

diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index 6fe199a..f2110ab 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -556,8 +556,11 @@ public:
                 BOOST_CHECK(!find(log, "start"));
 
                 AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfoSeq sessionInfos;
-                sessionInfos.push_back( { a, a->getInfo() } );
-                sessionInfos.push_back( { b, b->getInfo() } );
+                AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfo sessionInfoA = { a, a->getInfo() };
+                AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfo sessionInfoB = { b, b->getInfo() };
+                
+                sessionInfos.push_back(sessionInfoA);
+                sessionInfos.push_back(sessionInfoB);
 
                 bridge->addSessions(sessionInfos);
                 //
@@ -660,8 +663,10 @@ public:
                 BOOST_CHECK(!find(log, "start"));
 
                 AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfoSeq sessionInfos;
-                sessionInfos.push_back( { a, a->getInfo() } );
-                sessionInfos.push_back( { b, b->getInfo() } );
+                AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfo sessionInfoA = { a, a->getInfo() };
+                AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfo sessionInfoB = { b, b->getInfo() };
+                sessionInfos.push_back(sessionInfoA);
+                sessionInfos.push_back(sessionInfoB);
 
                 bridge->addSessions(sessionInfos);
                 //
@@ -762,8 +767,10 @@ public:
                 BOOST_CHECK(!find(log, "start"));
 
                 AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfoSeq sessionInfos;
-                sessionInfos.push_back( { a, a->getInfo() } );
-                sessionInfos.push_back( { b, b->getInfo() } );
+                AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfo sessionInfoA = { a, a->getInfo() };
+                AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfo sessionInfoB = { b, b->getInfo() };
+                sessionInfos.push_back(sessionInfoA);
+                sessionInfos.push_back(sessionInfoB);
 
                 bridge->addSessions(sessionInfos);
                 //
@@ -1116,8 +1123,11 @@ public:
                 AsteriskSCF::SessionCommunications::V1::SessionSeq eventSessions;
 
                 AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfoSeq sessionInfos;
-                sessionInfos.push_back( { a, a->getInfo() } );
-                sessionInfos.push_back( { b, b->getInfo() } );
+                AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfo sessionInfoA = { a, a->getInfo() };
+                AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfo sessionInfoB = { b, b->getInfo() };
+
+                sessionInfos.push_back(sessionInfoA);
+                sessionInfos.push_back(sessionInfoB);
 
                 bridge->addSessions(sessionInfos);
                 BOOST_REQUIRE(bridgeListener->waitForAdded(5000, eventSessions));
@@ -1216,8 +1226,11 @@ public:
                 AsteriskSCF::SessionCommunications::V1::SessionSeq eventSessions;
 
                 AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfoSeq sessionInfos;
-                sessionInfos.push_back( { a, a->getInfo() } );
-                sessionInfos.push_back( { b, b->getInfo() } );
+                AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfo sessionInfoA = { a, a->getInfo() };
+                AsteriskSCF::SessionCommunications::V1::SessionWithSessionInfo sessionInfoB = { b, b->getInfo() };
+
+                sessionInfos.push_back(sessionInfoA);
+                sessionInfos.push_back(sessionInfoB);
 
                 bridge->addSessions(sessionInfos);
                 BOOST_REQUIRE(bridgeListener->waitForAdded(5000, eventSessions));

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


-- 
asterisk-scf/release/bridging.git