From 1a3dedfca4b175474f44bfaa50c96f09fbff0a5f Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 3 Aug 2011 10:19:00 -0400 Subject: [PATCH] kill dead code/API --- src/core/model/type-id.cc | 78 --------------------------------------- src/core/model/type-id.h | 7 ---- 2 files changed, 85 deletions(-) diff --git a/src/core/model/type-id.cc b/src/core/model/type-id.cc index b9709d33d..233b3f14e 100644 --- a/src/core/model/type-id.cc +++ b/src/core/model/type-id.cc @@ -55,21 +55,12 @@ public: ns3::Ptr checker); uint32_t GetAttributeN (uint16_t uid) const; struct ns3::TypeId::AttributeInformation GetAttribute(uint16_t uid, uint32_t i) const; - std::string GetAttributeName (uint16_t uid, uint32_t i) const; - std::string GetAttributeHelp (uint16_t uid, uint32_t i) const; - uint32_t GetAttributeFlags (uint16_t uid, uint32_t i) const; - ns3::Ptr GetAttributeInitialValue (uint16_t uid, uint32_t i) const; - ns3::Ptr GetAttributeAccessor (uint16_t uid, uint32_t i) const; - ns3::Ptr GetAttributeChecker (uint16_t uid, uint32_t i) const; void AddTraceSource (uint16_t uid, std::string name, std::string help, ns3::Ptr accessor); uint32_t GetTraceSourceN (uint16_t uid) const; struct ns3::TypeId::TraceSourceInformation GetTraceSource(uint16_t uid, uint32_t i) const; - std::string GetTraceSourceName (uint16_t uid, uint32_t i) const; - std::string GetTraceSourceHelp (uint16_t uid, uint32_t i) const; - ns3::Ptr GetTraceSourceAccessor (uint16_t uid, uint32_t i) const; bool MustHideFromDocumentation (uint16_t uid) const; private: @@ -290,48 +281,6 @@ IidManager::GetAttribute(uint16_t uid, uint32_t i) const NS_ASSERT (i < information->attributes.size ()); return information->attributes[i]; } -std::string -IidManager::GetAttributeName (uint16_t uid, uint32_t i) const -{ - struct IidInformation *information = LookupInformation (uid); - NS_ASSERT (i < information->attributes.size ()); - return information->attributes[i].name; -} -std::string -IidManager::GetAttributeHelp (uint16_t uid, uint32_t i) const -{ - struct IidInformation *information = LookupInformation (uid); - NS_ASSERT (i < information->attributes.size ()); - return information->attributes[i].help; -} -uint32_t -IidManager::GetAttributeFlags (uint16_t uid, uint32_t i) const -{ - struct IidInformation *information = LookupInformation (uid); - NS_ASSERT (i < information->attributes.size ()); - return information->attributes[i].flags; -} -ns3::Ptr -IidManager::GetAttributeInitialValue (uint16_t uid, uint32_t i) const -{ - struct IidInformation *information = LookupInformation (uid); - NS_ASSERT (i < information->attributes.size ()); - return information->attributes[i].initialValue; -} -ns3::Ptr -IidManager::GetAttributeAccessor (uint16_t uid, uint32_t i) const -{ - struct IidInformation *information = LookupInformation (uid); - NS_ASSERT (i < information->attributes.size ()); - return information->attributes[i].accessor; -} -ns3::Ptr -IidManager::GetAttributeChecker (uint16_t uid, uint32_t i) const -{ - struct IidInformation *information = LookupInformation (uid); - NS_ASSERT (i < information->attributes.size ()); - return information->attributes[i].checker; -} bool IidManager::HasTraceSource (uint16_t uid, @@ -391,27 +340,6 @@ IidManager::GetTraceSource(uint16_t uid, uint32_t i) const NS_ASSERT (i < information->traceSources.size ()); return information->traceSources[i]; } -std::string -IidManager::GetTraceSourceName (uint16_t uid, uint32_t i) const -{ - struct IidInformation *information = LookupInformation (uid); - NS_ASSERT (i < information->traceSources.size ()); - return information->traceSources[i].name; -} -std::string -IidManager::GetTraceSourceHelp (uint16_t uid, uint32_t i) const -{ - struct IidInformation *information = LookupInformation (uid); - NS_ASSERT (i < information->traceSources.size ()); - return information->traceSources[i].help; -} -ns3::Ptr -IidManager::GetTraceSourceAccessor (uint16_t uid, uint32_t i) const -{ - struct IidInformation *information = LookupInformation (uid); - NS_ASSERT (i < information->traceSources.size ()); - return information->traceSources[i].accessor; -} bool IidManager::MustHideFromDocumentation (uint16_t uid) const { @@ -623,12 +551,6 @@ TypeId::GetAttributeFullName (uint32_t i) const struct TypeId::AttributeInformation info = GetAttribute(i); return GetName () + "::" + info.name; } -Ptr -TypeId::GetAttributeInitialValue (uint32_t i) const -{ - Ptr value = Singleton::Get ()->GetAttributeInitialValue (m_tid, i); - return value; -} uint32_t TypeId::GetTraceSourceN (void) const diff --git a/src/core/model/type-id.h b/src/core/model/type-id.h index 94045fd85..2ada22140 100644 --- a/src/core/model/type-id.h +++ b/src/core/model/type-id.h @@ -158,13 +158,6 @@ public: */ std::string GetAttributeFullName (uint32_t i) const; - /** - * \param i index into attribute array. - * \returns the value with which the associated attribute - * is initialized. - */ - Ptr GetAttributeInitialValue (uint32_t i) const; - /** * \returns a callback which can be used to instanciate an object * of this type.