Switch commoncpp2 to ucommon to solve dependency conflicts.
libccrtp was depending on commoncpp2, and have been replaced by a version
depending on ucommon as well.
diff --git a/jni/libccrtp/sources/src/outqueue.cpp b/jni/libccrtp/sources/src/outqueue.cpp
index 4edb34d..df37ee7 100644
--- a/jni/libccrtp/sources/src/outqueue.cpp
+++ b/jni/libccrtp/sources/src/outqueue.cpp
@@ -38,9 +38,7 @@
#include "private.h"
#include <ccrtp/oqueue.h>
-#ifdef CCXX_NAMESPACES
-namespace ost {
-#endif
+NAMESPACE_COMMONCPP
const size_t OutgoingDataQueueBase::defaultMaxSendSegmentSize = 65536;
@@ -330,7 +328,7 @@
// plus the time accumulated through successive
// overflows of timestamp. See below.
timeradd(&send,&(sendInfo.overflowTime),&send);
- gettimeofday(&now, NULL);
+ SysTime::gettimeofday(&now, NULL);
// Problem: when timestamp overflows, time goes back.
// We MUST ensure that _send_ is not too lower than
@@ -671,9 +669,7 @@
return NULL;
}
-#ifdef CCXX_NAMESPACES
-}
-#endif
+END_NAMESPACE
/** EMACS **
* Local variables: