From f5cdf259cc9f2897d4cbfd46033da0c7f188bdf5 Mon Sep 17 00:00:00 2001
From: "Gustavo J. A. M. Carneiro" <gjc@inescporto.pt>
Date: Mon, 31 Aug 2009 11:30:47 +0100
Subject: [PATCH] Make some copy-constructors private, remove not implemented
 method declarations, to make Python bindings work.

---
 src/internet-stack/arp-cache.h                   | 4 ++++
 src/internet-stack/nsc-tcp-l4-protocol.h         | 3 +++
 src/internet-stack/pending-data.h                | 1 -
 src/internet-stack/tcp-l4-protocol.h             | 2 ++
 src/routing/static-routing/ipv6-static-routing.h | 6 ------
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/internet-stack/arp-cache.h b/src/internet-stack/arp-cache.h
index dfbf80a78..757ea4df2 100644
--- a/src/internet-stack/arp-cache.h
+++ b/src/internet-stack/arp-cache.h
@@ -48,6 +48,10 @@ class Ipv4Interface;
  */
 class ArpCache : public Object
 {
+private:
+  ArpCache (ArpCache const &);
+  ArpCache& operator= (ArpCache const &);
+  
 public:
   static TypeId GetTypeId (void);
   class Entry;
diff --git a/src/internet-stack/nsc-tcp-l4-protocol.h b/src/internet-stack/nsc-tcp-l4-protocol.h
index 91ccd5963..2095267e1 100644
--- a/src/internet-stack/nsc-tcp-l4-protocol.h
+++ b/src/internet-stack/nsc-tcp-l4-protocol.h
@@ -90,6 +90,9 @@ protected:
   virtual void DoDispose (void);
   virtual void NotifyNewAggregate ();
 private:
+  NscTcpL4Protocol (NscTcpL4Protocol const &);
+  NscTcpL4Protocol& operator= (NscTcpL4Protocol const &);
+
   // NSC callbacks.
   // NSC invokes these hooks to interact with the simulator.
   // In any case, these methods are only to be called by NSC.
diff --git a/src/internet-stack/pending-data.h b/src/internet-stack/pending-data.h
index 4adec2f5c..7a4ba6d39 100644
--- a/src/internet-stack/pending-data.h
+++ b/src/internet-stack/pending-data.h
@@ -48,7 +48,6 @@ public:
   virtual ~PendingData ();     // Destructor
   uint32_t Size () const { return size;}
   // Serialization
-  uint32_t SSize ();                   // Size needed for serialization
   uint8_t*  Serialize (uint8_t*, uint32_t&); // Serialize to a buffer
   uint8_t*  Construct (uint8_t*, uint32_t&); // Construct from buffer
   virtual void Clear ();// Remove all associated data
diff --git a/src/internet-stack/tcp-l4-protocol.h b/src/internet-stack/tcp-l4-protocol.h
index 67a0645ee..8e6087e2d 100644
--- a/src/internet-stack/tcp-l4-protocol.h
+++ b/src/internet-stack/tcp-l4-protocol.h
@@ -121,6 +121,8 @@ private:
   void SendPacket (Ptr<Packet>, const TcpHeader &,
                   Ipv4Address, Ipv4Address);
   static ObjectFactory GetDefaultRttEstimatorFactory (void);
+  TcpL4Protocol (const TcpL4Protocol &o);
+  TcpL4Protocol &operator = (const TcpL4Protocol &o);
 
   std::vector<Ptr<TcpSocketImpl> > m_sockets;
 };
diff --git a/src/routing/static-routing/ipv6-static-routing.h b/src/routing/static-routing/ipv6-static-routing.h
index b786a0ff5..2593b60b2 100644
--- a/src/routing/static-routing/ipv6-static-routing.h
+++ b/src/routing/static-routing/ipv6-static-routing.h
@@ -186,12 +186,6 @@ class Ipv6StaticRouting : public Ipv6RoutingProtocol
      */
     Ipv6MulticastRoutingTableEntry GetMulticastRoute (uint32_t i) const;
 
-    /**
-     * \brief Get the default multicast IPv6 route.
-     * \return default Ipv6MulticastRoute
-     */
-    Ipv6MulticastRoutingTableEntry GetDefaultMulticastRoute () const;
-
     /**
      * \brief Remove a static multicast route.
      * \param origin IPv6 address of the source