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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  98cdbcf16080b782965b54c9c45df06ac51249c2 (commit)
      from  eb4000ab73494dd635592cf64489ba660693b05e (commit)

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


- Log -----------------------------------------------------------------
commit 98cdbcf16080b782965b54c9c45df06ac51249c2
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Dec 14 10:19:36 2010 -0600

    Disambiguate use of 0 as int or char const *.

diff --git a/slice b/slice
index 71b02b7..bdfc399 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 71b02b7071eab51d417f059566dc4aef1ebc2f2f
+Subproject commit bdfc399d5876152d46be8b47cd4122abca1d2ed3
diff --git a/test/TestRouting.cpp b/test/TestRouting.cpp
index f4c2687..9ba8016 100644
--- a/test/TestRouting.cpp
+++ b/test/TestRouting.cpp
@@ -70,7 +70,7 @@ void RoutingServiceTest::start(std::string const &name,
         argv.push_back(i->c_str());
     }
     // null terminated list
-    argv.push_back(0);
+    argv.push_back((char const *) 0);
 
     mCachedArgs.argc = argv.size() - 1;
     mCachedArgs.argv = (char**)&argv[0];

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


-- 
asterisk-scf/release/routing.git