--- a/bindings/python/genbinds.py Thu Apr 10 12:08:42 2014 +0200
+++ b/bindings/python/genbinds.py Thu Apr 10 15:57:44 2014 +0200
@@ -18,10 +18,10 @@
includes_dce = [
#'dce-application.h',
- #'dce-application-helper.h',
+ 'dce-application-helper.h',
#'dce-manager-helper.h',
#'ipv4-dce-routing-helper.h',
- 'linux-stack-helper.h',
+ #'linux-stack-helper.h',
]
--- a/bindings/python/ns3_module_dce.cpp Thu Apr 10 12:08:42 2014 +0200
+++ b/bindings/python/ns3_module_dce.cpp Thu Apr 10 15:57:44 2014 +0200
@@ -1,4 +1,4 @@
-/* This file was generated by PyBindGen 0.17.0.870 */
+/* This file was generated by PyBindGen 0.17.0.872 */
#define PY_SSIZE_T_CLEAN
#include <Python.h>
#include <stddef.h>
--- a/bindings/python/ns3_module_dce.py Thu Apr 10 12:08:42 2014 +0200
+++ b/bindings/python/ns3_module_dce.py Thu Apr 10 15:57:44 2014 +0200
@@ -29,7 +29,7 @@
module.add_class('Object', import_from_module='ns.core')
# ns-3 network
- module.add_class('Application', import_from_module='ns.network')
+ module.add_class('Application', import_from_module='ns.network', parent=root_module['ns3::Object'])
module.add_class('ApplicationContainer', import_from_module='ns.network')
module.add_class('Node', import_from_module='ns.network')
module.add_class('NodeContainer', import_from_module='ns.network')
@@ -230,8 +230,9 @@
'void',
[param('ns3::uid_t', 'i')])
cls.add_method('GetDCEApplication',
- retval('ns3::Ptr<ns3::DceApplication>', caller_owns_return=True),
- [param('ns3::Ptr<ns3::Application>', 'a', transfer_ownership=True)],
+ retval('ns3::DceApplication *', caller_owns_return=True),
+ [param('ns3::Application *', 'a')],
+ #[param('ns3::Ptr<ns3::Application>', 'a', transfer_ownership=True)],
is_virtual=True)
return
--- a/helper/dce-application-helper.cc Thu Apr 10 12:08:42 2014 +0200
+++ b/helper/dce-application-helper.cc Thu Apr 10 15:57:44 2014 +0200
@@ -210,12 +210,12 @@
{
m_egid = i;
}
-Ptr<DceApplication>
-DceApplicationHelper::GetDCEApplication (Ptr<Application> a)
+DceApplication *
+DceApplicationHelper::GetDCEApplication (Application *a)
{
- DceApplication *da = dynamic_cast<DceApplication*>(PeekPointer(a));
- Ptr<DceApplication> p(da);
- return p;
+ //DceApplication *da = dynamic_cast<DceApplication*>(PeekPointer(a));
+ //Ptr<DceApplication> p(da);
+ return (DceApplication *)a;
}
} // namespace ns3
--- a/helper/dce-application-helper.h Thu Apr 10 12:08:42 2014 +0200
+++ b/helper/dce-application-helper.h Thu Apr 10 15:57:44 2014 +0200
@@ -126,8 +126,8 @@
* Temporary function for NEPI integration
*/
virtual
- Ptr<DceApplication>
- GetDCEApplication (Ptr<Application> a);
+ DceApplication *
+ GetDCEApplication (Application *a);
private:
bool m_isBinary;