Make some copy-constructors private, remove not implemented method declarations, to make Python bindings work.
1.1 --- a/src/internet-stack/arp-cache.h Tue Aug 25 08:52:57 2009 +0200
1.2 +++ b/src/internet-stack/arp-cache.h Mon Aug 31 11:30:47 2009 +0100
1.3 @@ -48,6 +48,10 @@
1.4 */
1.5 class ArpCache : public Object
1.6 {
1.7 +private:
1.8 + ArpCache (ArpCache const &);
1.9 + ArpCache& operator= (ArpCache const &);
1.10 +
1.11 public:
1.12 static TypeId GetTypeId (void);
1.13 class Entry;
2.1 --- a/src/internet-stack/nsc-tcp-l4-protocol.h Tue Aug 25 08:52:57 2009 +0200
2.2 +++ b/src/internet-stack/nsc-tcp-l4-protocol.h Mon Aug 31 11:30:47 2009 +0100
2.3 @@ -90,6 +90,9 @@
2.4 virtual void DoDispose (void);
2.5 virtual void NotifyNewAggregate ();
2.6 private:
2.7 + NscTcpL4Protocol (NscTcpL4Protocol const &);
2.8 + NscTcpL4Protocol& operator= (NscTcpL4Protocol const &);
2.9 +
2.10 // NSC callbacks.
2.11 // NSC invokes these hooks to interact with the simulator.
2.12 // In any case, these methods are only to be called by NSC.
3.1 --- a/src/internet-stack/pending-data.h Tue Aug 25 08:52:57 2009 +0200
3.2 +++ b/src/internet-stack/pending-data.h Mon Aug 31 11:30:47 2009 +0100
3.3 @@ -48,7 +48,6 @@
3.4 virtual ~PendingData (); // Destructor
3.5 uint32_t Size () const { return size;}
3.6 // Serialization
3.7 - uint32_t SSize (); // Size needed for serialization
3.8 uint8_t* Serialize (uint8_t*, uint32_t&); // Serialize to a buffer
3.9 uint8_t* Construct (uint8_t*, uint32_t&); // Construct from buffer
3.10 virtual void Clear ();// Remove all associated data
4.1 --- a/src/internet-stack/tcp-l4-protocol.h Tue Aug 25 08:52:57 2009 +0200
4.2 +++ b/src/internet-stack/tcp-l4-protocol.h Mon Aug 31 11:30:47 2009 +0100
4.3 @@ -121,6 +121,8 @@
4.4 void SendPacket (Ptr<Packet>, const TcpHeader &,
4.5 Ipv4Address, Ipv4Address);
4.6 static ObjectFactory GetDefaultRttEstimatorFactory (void);
4.7 + TcpL4Protocol (const TcpL4Protocol &o);
4.8 + TcpL4Protocol &operator = (const TcpL4Protocol &o);
4.9
4.10 std::vector<Ptr<TcpSocketImpl> > m_sockets;
4.11 };
5.1 --- a/src/routing/static-routing/ipv6-static-routing.h Tue Aug 25 08:52:57 2009 +0200
5.2 +++ b/src/routing/static-routing/ipv6-static-routing.h Mon Aug 31 11:30:47 2009 +0100
5.3 @@ -187,12 +187,6 @@
5.4 Ipv6MulticastRoutingTableEntry GetMulticastRoute (uint32_t i) const;
5.5
5.6 /**
5.7 - * \brief Get the default multicast IPv6 route.
5.8 - * \return default Ipv6MulticastRoute
5.9 - */
5.10 - Ipv6MulticastRoutingTableEntry GetDefaultMulticastRoute () const;
5.11 -
5.12 - /**
5.13 * \brief Remove a static multicast route.
5.14 * \param origin IPv6 address of the source
5.15 * \param group the multicast group address.