From 6495c220a9abffafd9e78aee14fc334d6da178b5 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Fri, 11 May 2007 18:42:39 +0200 Subject: [PATCH] rename ns-unknown.h/cc ns-unknown-manager.h/cc --- SConstruct | 8 ++++---- src/applications/application-list.h | 2 +- src/core/{ns-unknown-manager.cc => component-manager.cc} | 4 ++-- src/core/{ns-unknown-manager.h => component-manager.h} | 2 +- src/core/{ns-unknown.cc => interface.cc} | 2 +- src/core/{ns-unknown.h => interface.h} | 0 src/internet-node/i-arp-private.h | 2 +- src/internet-node/i-ipv4-private.h | 2 +- src/internet-node/ipv4-l4-demux.h | 2 +- src/internet-node/l3-demux.h | 2 +- src/node/i-ipv4.h | 2 +- src/node/i-udp.h | 2 +- src/node/node.h | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) rename src/core/{ns-unknown-manager.cc => component-manager.cc} (98%) rename src/core/{ns-unknown-manager.h => component-manager.h} (99%) rename src/core/{ns-unknown.cc => interface.cc} (99%) rename src/core/{ns-unknown.h => interface.h} (100%) diff --git a/SConstruct b/SConstruct index 7faa5a2af..607dcb1ce 100644 --- a/SConstruct +++ b/SConstruct @@ -25,12 +25,12 @@ core.add_sources([ 'test.cc', 'random-variable.cc', 'rng-stream.cc', - 'ns-unknown.cc', + 'interface.cc', 'uid-manager.cc', 'default-value.cc', 'command-line.cc', 'type-name.cc', - 'ns-unknown-manager.cc', + 'component-manager.cc', ]) env = Environment() if env['PLATFORM'] == 'posix' or env['PLATFORM'] == 'darwin' or env['PLATFORM'] == 'cygwin': @@ -58,11 +58,11 @@ core.add_inst_headers([ 'test.h', 'random-variable.h', 'rng-stream.h', - 'ns-unknown.h', + 'interface.h', 'default-value.h', 'command-line.h', 'type-name.h', - 'ns-unknown-manager.h', + 'component-manager.h', ]) def config_core (env, config): diff --git a/src/applications/application-list.h b/src/applications/application-list.h index 46576ecf3..acfa6ae07 100644 --- a/src/applications/application-list.h +++ b/src/applications/application-list.h @@ -25,7 +25,7 @@ #define __APPLICATION_LIST_H__ #include "application.h" -#include "ns3/ns-unknown.h" +#include "ns3/interface.h" #include "ns3/ptr.h" #include diff --git a/src/core/ns-unknown-manager.cc b/src/core/component-manager.cc similarity index 98% rename from src/core/ns-unknown-manager.cc rename to src/core/component-manager.cc index 46dbb2a12..a194499df 100644 --- a/src/core/ns-unknown-manager.cc +++ b/src/core/component-manager.cc @@ -18,7 +18,7 @@ * * Author: Mathieu Lacage */ -#include "ns-unknown-manager.h" +#include "component-manager.h" #include "uid-manager.h" #include "singleton.h" @@ -91,7 +91,7 @@ NsUnknownManager::Register (std::string name, CallbackBase *callback) #ifdef RUN_SELF_TESTS #include "test.h" -#include "ns-unknown.h" +#include "interface.h" namespace { diff --git a/src/core/ns-unknown-manager.h b/src/core/component-manager.h similarity index 99% rename from src/core/ns-unknown-manager.h rename to src/core/component-manager.h index 85987fb5a..edcb4e4ad 100644 --- a/src/core/ns-unknown-manager.h +++ b/src/core/component-manager.h @@ -25,7 +25,7 @@ #include #include #include "callback.h" -#include "ns-unknown.h" +#include "interface.h" #include "fatal-error.h" #include "ptr.h" diff --git a/src/core/ns-unknown.cc b/src/core/interface.cc similarity index 99% rename from src/core/ns-unknown.cc rename to src/core/interface.cc index 92be9cbfd..33aa47182 100644 --- a/src/core/ns-unknown.cc +++ b/src/core/interface.cc @@ -18,7 +18,7 @@ * * Author: Mathieu Lacage */ -#include "ns-unknown.h" +#include "interface.h" #include "singleton.h" #include "uid-manager.h" #include diff --git a/src/core/ns-unknown.h b/src/core/interface.h similarity index 100% rename from src/core/ns-unknown.h rename to src/core/interface.h diff --git a/src/internet-node/i-arp-private.h b/src/internet-node/i-arp-private.h index 7b3647601..4d7b10b97 100644 --- a/src/internet-node/i-arp-private.h +++ b/src/internet-node/i-arp-private.h @@ -21,7 +21,7 @@ #ifndef I_ARP_PRIVATE_H #define I_ARP_PRIVATE_H -#include "ns3/ns-unknown.h" +#include "ns3/interface.h" #include "ns3/ipv4-address.h" namespace ns3 { diff --git a/src/internet-node/i-ipv4-private.h b/src/internet-node/i-ipv4-private.h index 61df90c96..fb0a43ade 100644 --- a/src/internet-node/i-ipv4-private.h +++ b/src/internet-node/i-ipv4-private.h @@ -21,7 +21,7 @@ #ifndef I_IPV4_PRIVATE_H #define I_IPV4_PRIVATE_H -#include "ns3/ns-unknown.h" +#include "ns3/interface.h" #include "ns3/ipv4-address.h" #include "ns3/ptr.h" #include diff --git a/src/internet-node/ipv4-l4-demux.h b/src/internet-node/ipv4-l4-demux.h index 62477593e..ca696530d 100644 --- a/src/internet-node/ipv4-l4-demux.h +++ b/src/internet-node/ipv4-l4-demux.h @@ -26,7 +26,7 @@ #define IPV4_L4_DEMUX_H #include -#include "ns3/ns-unknown.h" +#include "ns3/interface.h" #include "ns3/ptr.h" namespace ns3 { diff --git a/src/internet-node/l3-demux.h b/src/internet-node/l3-demux.h index 7774a165e..6ab1e6410 100644 --- a/src/internet-node/l3-demux.h +++ b/src/internet-node/l3-demux.h @@ -28,7 +28,7 @@ #define L3_DEMUX_H #include -#include "ns3/ns-unknown.h" +#include "ns3/interface.h" #include "ns3/ptr.h" namespace ns3 { diff --git a/src/node/i-ipv4.h b/src/node/i-ipv4.h index 27fc31dd8..65a10ae38 100644 --- a/src/node/i-ipv4.h +++ b/src/node/i-ipv4.h @@ -23,7 +23,7 @@ #include #include "ns3/ipv4-address.h" -#include "ns3/ns-unknown.h" +#include "ns3/interface.h" namespace ns3 { diff --git a/src/node/i-udp.h b/src/node/i-udp.h index 32a92c7ce..11ec15ba8 100644 --- a/src/node/i-udp.h +++ b/src/node/i-udp.h @@ -21,7 +21,7 @@ #ifndef I_UDP_H #define I_UDP_H -#include "ns3/ns-unknown.h" +#include "ns3/interface.h" #include "ns3/ptr.h" namespace ns3 { diff --git a/src/node/node.h b/src/node/node.h index e5b30e1da..ed13fbcd0 100644 --- a/src/node/node.h +++ b/src/node/node.h @@ -27,7 +27,7 @@ #include -#include "ns3/ns-unknown.h" +#include "ns3/interface.h" namespace ns3 {