From e9f5159b6303c8a6cd426f24073dbdfb9b156a4f Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Wed, 17 Mar 2010 11:02:55 +0000 Subject: [PATCH] Prepare the topology-read module for python bindings (disable copy contructors) --- src/contrib/topology-read/inet-topology-reader.h | 4 ++++ src/contrib/topology-read/orbis-topology-reader.h | 4 ++++ src/contrib/topology-read/topology-reader.h | 4 ++++ src/contrib/topology-read/wscript | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/contrib/topology-read/inet-topology-reader.h b/src/contrib/topology-read/inet-topology-reader.h index f7197129e..39e4200e8 100644 --- a/src/contrib/topology-read/inet-topology-reader.h +++ b/src/contrib/topology-read/inet-topology-reader.h @@ -66,6 +66,10 @@ public: */ virtual NodeContainer Read (void); +private: + InetTopologyReader (const InetTopologyReader&); + InetTopologyReader& operator= (const InetTopologyReader&); + // end class InetTopologyReader }; diff --git a/src/contrib/topology-read/orbis-topology-reader.h b/src/contrib/topology-read/orbis-topology-reader.h index e4d66ce0a..7e83afbc4 100644 --- a/src/contrib/topology-read/orbis-topology-reader.h +++ b/src/contrib/topology-read/orbis-topology-reader.h @@ -61,6 +61,10 @@ public: */ virtual NodeContainer Read (void); +private: + OrbisTopologyReader (const OrbisTopologyReader&); + OrbisTopologyReader& operator= (const OrbisTopologyReader&); + // end class OrbisTopologyReader }; diff --git a/src/contrib/topology-read/topology-reader.h b/src/contrib/topology-read/topology-reader.h index a913ebd06..bd4827123 100644 --- a/src/contrib/topology-read/topology-reader.h +++ b/src/contrib/topology-read/topology-reader.h @@ -190,6 +190,10 @@ private: void AddLink (Link link); private: + + TopologyReader (const TopologyReader&); + TopologyReader& operator= (const TopologyReader&); + std::string m_fileName; std::list m_linksList; diff --git a/src/contrib/topology-read/wscript b/src/contrib/topology-read/wscript index 5bd79388b..ffec41884 100644 --- a/src/contrib/topology-read/wscript +++ b/src/contrib/topology-read/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_module('topology-read') + obj = bld.create_ns3_module('topology-read', ['node']) obj.source = [ 'topology-reader.cc', 'inet-topology-reader.cc',