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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  dda37f6ab74478d0c03fccafba90a7b05fad72f4 (commit)
       via  b9291284df422e18419a07fa3bf0682c3f317a60 (commit)
      from  837913ff0338a6925e6fda63380b2b43d1b2e0b0 (commit)

Summary of changes:
 test/TestRTPpjmedia.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit dda37f6ab74478d0c03fccafba90a7b05fad72f4
Merge: b929128 837913f
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Dec 14 10:10:50 2010 -0600

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/media_rtp_pjmedia


commit b9291284df422e18419a07fa3bf0682c3f317a60
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Dec 14 10:10:15 2010 -0600

    Add cast so there is no int/char * confusion.

diff --git a/test/TestRTPpjmedia.cpp b/test/TestRTPpjmedia.cpp
index bd882f2..c56da63 100644
--- a/test/TestRTPpjmedia.cpp
+++ b/test/TestRTPpjmedia.cpp
@@ -812,7 +812,7 @@ void MediaRTPpjmediaTest::start(std::string const &name,
         argv.push_back(i->c_str());
     }
     // null terminated list
-    argv.push_back(0);
+    argv.push_back((const char *) 0);
 
     mCachedArgs.argc = argv.size() - 1;
     mCachedArgs.argv = (char**)&argv[0];

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


-- 
asterisk-scf/release/media_rtp_pjmedia.git