diff --git a/src/core/enum-value.cc b/src/core/enum-value.cc index e4755f53f..e4b3de183 100644 --- a/src/core/enum-value.cc +++ b/src/core/enum-value.cc @@ -5,27 +5,27 @@ namespace ns3 { -EnumValue::EnumValue (int v) +Enum::Enum (int v) : m_v (v) {} void -EnumValue::Set (int v) +Enum::Set (int v) { m_v = v; } int -EnumValue::Get (void) const +Enum::Get (void) const { return m_v; } Attribute -EnumValue::Copy (void) const +Enum::Copy (void) const { - return Attribute::Create (*this); + return Attribute::Create (*this); } std::string -EnumValue::SerializeToString (Ptr checker) const +Enum::SerializeToString (Ptr checker) const { const EnumChecker *p = dynamic_cast (PeekPointer (checker)); NS_ASSERT (p != 0); @@ -37,12 +37,12 @@ EnumValue::SerializeToString (Ptr checker) const } } - NS_FATAL_ERROR ("The user has set an invalid C++ value in this EnumValue"); + NS_FATAL_ERROR ("The user has set an invalid C++ value in this Enum"); // quiet compiler. return ""; } bool -EnumValue::DeserializeFromString (std::string value, Ptr checker) +Enum::DeserializeFromString (std::string value, Ptr checker) { const EnumChecker *p = dynamic_cast (PeekPointer (checker)); NS_ASSERT (p != 0); @@ -57,18 +57,18 @@ EnumValue::DeserializeFromString (std::string value, Ptr return false; } -EnumValue::EnumValue (Attribute value) +Enum::Enum (Attribute value) { - const EnumValue *v = value.DynCast (); + const Enum *v = value.DynCast (); if (v == 0) { NS_FATAL_ERROR ("assigning non-Enum value to Enum value."); } m_v = v->m_v; } -EnumValue::operator Attribute () const +Enum::operator Attribute () const { - return Attribute::Create (*this); + return Attribute::Create (*this); } @@ -89,7 +89,7 @@ EnumChecker::Add (int v, std::string name) bool EnumChecker::Check (Attribute value) const { - const EnumValue *p = value.DynCast (); + const Enum *p = value.DynCast (); if (p == 0) { return false; diff --git a/src/core/enum-value.h b/src/core/enum-value.h index f253f873d..e73b58c6f 100644 --- a/src/core/enum-value.h +++ b/src/core/enum-value.h @@ -7,10 +7,10 @@ namespace ns3 { -class EnumValue : public AttributeValue +class Enum : public AttributeValue { public: - EnumValue (int v); + Enum (int v); void Set (int v); int Get (void) const; @@ -18,7 +18,7 @@ public: virtual std::string SerializeToString (Ptr checker) const; virtual bool DeserializeFromString (std::string value, Ptr checker); - EnumValue (Attribute value); + Enum (Attribute value); operator Attribute () const; private: int m_v; @@ -36,7 +36,7 @@ public: virtual bool Check (Attribute value) const; private: - friend class EnumValue; + friend class Enum; typedef std::list > ValueSet; ValueSet m_valueSet; }; @@ -68,13 +68,13 @@ namespace ns3 { template Ptr MakeEnumAccessor (T1 a1) { - return MakeAccessorHelper (a1); + return MakeAccessorHelper (a1); } template Ptr MakeEnumAccessor (T1 a1, T2 a2) { - return MakeAccessorHelper (a1, a2); + return MakeAccessorHelper (a1, a2); } } // namespace ns3 diff --git a/src/core/value-test.cc b/src/core/value-test.cc index 95970a51a..069eba431 100644 --- a/src/core/value-test.cc +++ b/src/core/value-test.cc @@ -72,7 +72,7 @@ public: MakeUintegerAccessor (&AccessorObjectTest::m_uint8), MakeUintegerChecker ()) .AddParameter ("TestEnum", "help text", - EnumValue (TEST_A), + Enum (TEST_A), MakeEnumAccessor (&AccessorObjectTest::m_enum), MakeEnumChecker (TEST_A, "TestA", TEST_B, "TestB", @@ -289,19 +289,19 @@ AccessorTest::RunTests (void) CHECK_GET_PARAM (p, "TestFloat", FpValue, (float)+2.3); CHECK_GET_STR (p, "TestEnum", "TestA"); - CHECK_GET_PARAM (p, "TestEnum", EnumValue, AccessorObjectTest::TEST_A); - NS_TEST_ASSERT (p->Set ("TestEnum", EnumValue (AccessorObjectTest::TEST_C))); + CHECK_GET_PARAM (p, "TestEnum", Enum, AccessorObjectTest::TEST_A); + NS_TEST_ASSERT (p->Set ("TestEnum", Enum (AccessorObjectTest::TEST_C))); CHECK_GET_STR (p, "TestEnum", "TestC"); - CHECK_GET_PARAM (p, "TestEnum", EnumValue, AccessorObjectTest::TEST_C); + CHECK_GET_PARAM (p, "TestEnum", Enum, AccessorObjectTest::TEST_C); NS_TEST_ASSERT (p->Set ("TestEnum", "TestB")); CHECK_GET_STR (p, "TestEnum", "TestB"); - CHECK_GET_PARAM (p, "TestEnum", EnumValue, AccessorObjectTest::TEST_B); + CHECK_GET_PARAM (p, "TestEnum", Enum, AccessorObjectTest::TEST_B); NS_TEST_ASSERT (!p->Set ("TestEnum", "TestD")); CHECK_GET_STR (p, "TestEnum", "TestB"); - CHECK_GET_PARAM (p, "TestEnum", EnumValue, AccessorObjectTest::TEST_B); - NS_TEST_ASSERT (!p->Set ("TestEnum", EnumValue (5))); + CHECK_GET_PARAM (p, "TestEnum", Enum, AccessorObjectTest::TEST_B); + NS_TEST_ASSERT (!p->Set ("TestEnum", Enum (5))); CHECK_GET_STR (p, "TestEnum", "TestB"); - CHECK_GET_PARAM (p, "TestEnum", EnumValue, AccessorObjectTest::TEST_B); + CHECK_GET_PARAM (p, "TestEnum", Enum, AccessorObjectTest::TEST_B); RandomVariable ran = p->Get ("TestRandom"); NS_TEST_ASSERT (p->Set ("TestRandom", UniformVariable (0.0, 1.0))); diff --git a/src/mobility/position-allocator.cc b/src/mobility/position-allocator.cc index c8fbd44d6..2ae7a5bd1 100644 --- a/src/mobility/position-allocator.cc +++ b/src/mobility/position-allocator.cc @@ -74,7 +74,7 @@ GridPositionAllocator::GetTypeId (void) MakeFpAccessor (&GridPositionAllocator::m_deltaY), MakeFpChecker ()) .AddParameter ("LayoutType", "The type of layout.", - EnumValue (ROW_FIRST), + Enum (ROW_FIRST), MakeEnumAccessor (&GridPositionAllocator::m_layoutType), MakeEnumChecker (ROW_FIRST, "RowFirst", COLUMN_FIRST, "ColumnFirst")) diff --git a/src/mobility/random-walk-2d-mobility-model.cc b/src/mobility/random-walk-2d-mobility-model.cc index ab35964e0..20c25bd14 100644 --- a/src/mobility/random-walk-2d-mobility-model.cc +++ b/src/mobility/random-walk-2d-mobility-model.cc @@ -55,7 +55,7 @@ RandomWalk2dMobilityModel::GetTypeId (void) .AddParameter ("mode", "The mode indicates the condition used to " "change the current speed and direction", - EnumValue (RandomWalk2dMobilityModel::MODE_DISTANCE), + Enum (RandomWalk2dMobilityModel::MODE_DISTANCE), MakeEnumAccessor (&RandomWalk2dMobilityModel::m_mode), MakeEnumChecker (RandomWalk2dMobilityModel::MODE_DISTANCE, "Distance", RandomWalk2dMobilityModel::MODE_TIME, "Time"))