From c69ffe0206c72995fd093aadaa4bd503d315740e Mon Sep 17 00:00:00 2001 From: Eduardo Almeida Date: Mon, 10 Feb 2025 20:34:39 +0000 Subject: [PATCH] Reformat comments near closing braces to avoid issues with clang-format-18 --- src/core/examples/hash-example.cc | 9 ++- src/core/examples/sample-show-progress.cc | 3 +- src/core/model/attribute-accessor-helper.h | 2 + src/core/model/command-line.h | 23 +++++-- src/core/model/config.cc | 9 ++- src/core/model/environment-variable.h | 6 +- src/core/model/example-as-test.h | 6 +- src/core/model/hash-function.h | 12 +++- src/core/model/hash-murmur3.h | 3 +- src/core/model/hash.h | 2 + src/core/model/length.h | 2 + src/core/model/log.h | 5 +- src/core/model/nstime.h | 6 +- src/core/model/priority-queue-scheduler.h | 3 +- src/core/model/random-variable-stream.h | 60 ++++++++++++------- src/core/model/simulator.h | 2 + .../test/environment-variable-test-suite.cc | 3 +- src/core/test/hash-test-suite.cc | 3 +- .../test/random-variable-stream-test-suite.cc | 3 +- src/core/test/splitstring-test-suite.cc | 3 +- src/lte/model/lte-anr-sap.h | 6 +- src/lte/model/lte-control-messages.h | 6 +- src/lte/model/lte-enb-rrc.h | 13 ++-- src/lte/model/lte-ffr-rrc-sap.h | 6 +- src/lte/model/lte-ffr-sap.h | 6 +- src/lte/model/lte-handover-management-sap.h | 6 +- .../model/no-op-component-carrier-manager.h | 11 ++-- src/lte/test/lte-test-ue-measurements.h | 9 ++- src/lte/test/test-lte-handover-failure.cc | 3 +- src/lte/test/test-lte-handover-target.cc | 3 +- src/mpi/test/mpi-test-suite.cc | 3 +- ...raced-value-callback-typedef-test-suite.cc | 3 +- src/uan/model/uan-header-rc.h | 15 +++-- src/uan/model/uan-mac-rc.h | 6 +- src/uan/model/uan-phy-dual.h | 6 +- src/uan/model/uan-phy-gen.h | 18 ++++-- src/uan/model/uan-phy.h | 13 ++-- src/uan/model/uan-prop-model.h | 9 ++- src/uan/model/uan-transducer.h | 6 +- src/uan/model/uan-tx-mode.h | 9 ++- src/wifi/model/ht/ht-ppdu.h | 4 +- src/wifi/model/non-ht/dsss-ppdu.h | 4 +- src/wifi/model/non-ht/ofdm-ppdu.h | 4 +- src/wifi/model/vht/vht-ppdu.h | 4 +- src/wifi/test/wifi-non-ht-dup-test.cc | 8 ++- src/wifi/test/wifi-phy-mu-mimo-test.cc | 8 ++- src/wifi/test/wifi-phy-ofdma-test.cc | 16 +++-- utils/print-introspected-doxygen.cc | 3 +- 48 files changed, 257 insertions(+), 116 deletions(-) diff --git a/src/core/examples/hash-example.cc b/src/core/examples/hash-example.cc index eb868d81f..45bd383fb 100644 --- a/src/core/examples/hash-example.cc +++ b/src/core/examples/hash-example.cc @@ -248,7 +248,8 @@ class Collider /** The list of collisions. */ collision_t m_coll; -}; // class Collider + // end of class Collider +}; /** * Word list and hashers to test. @@ -412,7 +413,8 @@ class Dictionary std::vector m_hashes; /**< List of hash Colliders. */ std::vector m_words; /**< List of unique words. */ -}; // class Dictionary + // end of class Dictionary +}; /** * Source word list files. @@ -486,7 +488,8 @@ class DictFiles private: std::vector m_files; /**< List of word files to use. */ -}; // class DictFiles + // end of class DictFiles +}; } // namespace Example diff --git a/src/core/examples/sample-show-progress.cc b/src/core/examples/sample-show-progress.cc index 12ce7acfd..f8c5f4348 100644 --- a/src/core/examples/sample-show-progress.cc +++ b/src/core/examples/sample-show-progress.cc @@ -92,7 +92,8 @@ class Hold : public SimpleRefCount /** Time between switching workloads. */ Time m_interval; -}; // class HOLD + // end of class HOLD +}; } // unnamed namespace diff --git a/src/core/model/attribute-accessor-helper.h b/src/core/model/attribute-accessor-helper.h index bd26045a8..5a1db7466 100644 --- a/src/core/model/attribute-accessor-helper.h +++ b/src/core/model/attribute-accessor-helper.h @@ -217,6 +217,8 @@ class AccessorHelper : public AttributeAccessor * @returns true if the member value could be retrieved successfully */ virtual bool DoGet(const T* object, U* v) const = 0; + + // end of class AccessorHelper }; /** diff --git a/src/core/model/command-line.h b/src/core/model/command-line.h index a4e8512f9..24433ff3d 100644 --- a/src/core/model/command-line.h +++ b/src/core/model/command-line.h @@ -451,7 +451,9 @@ class CommandLine * @return The default value */ virtual std::string GetDefault() const = 0; - }; // class Item + + // end of class Item + }; /** * @ingroup commandline @@ -468,7 +470,9 @@ class CommandLine T* m_valuePtr; /**< Pointer to the POD location */ std::string m_default; /**< String representation of default value */ - }; // class UserItem + + // end of class UserItem + }; /** * @ingroup commandline @@ -488,7 +492,9 @@ class CommandLine * function is \c const in the base class Item. */ mutable std::string m_value; - }; // class StringItem + + // end of class StringItem + }; /** * @ingroup commandline @@ -508,7 +514,9 @@ class CommandLine std::size_t m_size; /** The default value. */ std::string m_default; - }; // class CharStarItem + + // end of class CharStarItem + }; /** * @ingroup commandline @@ -524,7 +532,9 @@ class CommandLine ns3::Callback m_callback; /**< The Callback */ std::string m_default; /**< The default value, as a string, if it exists. */ - }; // class CallbackItem + + // end of class CallbackItem + }; /** * Tuple type returned by GetOptionName(). @@ -659,7 +669,8 @@ class CommandLine /** The source file name (without `.cc`), as would be given to `ns3 run` */ std::string m_shortName; -}; // class CommandLine + // end of class CommandLine +}; /** * @ingroup commandline diff --git a/src/core/model/config.cc b/src/core/model/config.cc index 99557e569..f6c9778a0 100644 --- a/src/core/model/config.cc +++ b/src/core/model/config.cc @@ -220,7 +220,8 @@ class ArrayMatcher /** The Config path element. */ std::string m_element; -}; // class ArrayMatcher + // end of class ArrayMatcher +}; ArrayMatcher::ArrayMatcher(std::string element) : m_element(element) @@ -368,7 +369,8 @@ class Resolver /** The Config path. */ std::string m_path; -}; // class Resolver + // end of class Resolver +}; Resolver::Resolver(std::string path) : m_path(path) @@ -672,7 +674,8 @@ class ConfigImpl : public Singleton /** The list of Config path roots. */ Roots m_roots; -}; // class ConfigImpl + // end of class ConfigImpl +}; void ConfigImpl::ParsePath(std::string path, std::string* root, std::string* leaf) const diff --git a/src/core/model/environment-variable.h b/src/core/model/environment-variable.h index 4bf77f805..18e919d88 100644 --- a/src/core/model/environment-variable.h +++ b/src/core/model/environment-variable.h @@ -154,7 +154,8 @@ class EnvironmentVariable /** The key, value store. */ KeyValueStore m_dict; - }; // class Dictionary + // end of class Dictionary + }; /** * Set an environment variable. @@ -214,7 +215,8 @@ class EnvironmentVariable /** Clear the instance, forcing all new lookups. */ static void Clear(); -}; // class EnvironmentVariable + // end of class EnvironmentVariable +}; } // namespace ns3 diff --git a/src/core/model/example-as-test.h b/src/core/model/example-as-test.h index 72e4e1dcf..37bbd4514 100644 --- a/src/core/model/example-as-test.h +++ b/src/core/model/example-as-test.h @@ -102,7 +102,8 @@ class ExampleAsTestCase : public TestCase std::string m_args; /**< Any additional arguments to the program. */ bool m_shouldNotErr; /**< Whether error return status is a test failure. */ -}; // class ExampleAsTestCase + // end of class ExampleAsTestCase +}; /** * @ingroup testing @@ -209,7 +210,8 @@ class ExampleAsTestSuite : public TestSuite const std::string args = "", const Duration duration = Duration::QUICK, const bool shouldNotErr = true); -}; // class ExampleAsTestSuite + // end of class ExampleAsTestSuite +}; } // namespace ns3 diff --git a/src/core/model/hash-function.h b/src/core/model/hash-function.h index 1777f187e..135bcab12 100644 --- a/src/core/model/hash-function.h +++ b/src/core/model/hash-function.h @@ -88,7 +88,9 @@ class Implementation : public SimpleRefCount virtual ~Implementation() { } -}; // Hashfunction + + // end of class Hash::Implementation +}; /*-------------------------------------- * Hash function implementation @@ -146,7 +148,9 @@ class Hash32 : public Implementation private: Hash32Function_ptr m_fp; /**< The hash function. */ -}; // Hash32 + + // end of class Hash::Function::Hash32 +}; /** * @ingroup hash @@ -187,7 +191,9 @@ class Hash64 : public Implementation private: Hash64Function_ptr m_fp; /**< The hash function. */ -}; // Hash64 + + // end of class Hash::Function::Hash64 +}; } // namespace Function diff --git a/src/core/model/hash-murmur3.h b/src/core/model/hash-murmur3.h index cf7db10af..facfb12e6 100644 --- a/src/core/model/hash-murmur3.h +++ b/src/core/model/hash-murmur3.h @@ -107,7 +107,8 @@ class Murmur3 : public Implementation std::size_t m_size64; /**@}*/ -}; // class Murmur3 + // end of class Murmur3 +}; } // namespace Function diff --git a/src/core/model/hash.h b/src/core/model/hash.h index ff1e49c49..3286ea91d 100644 --- a/src/core/model/hash.h +++ b/src/core/model/hash.h @@ -162,6 +162,8 @@ class Hasher private: Ptr m_impl; /**< Hash implementation. */ + + // end of class Hasher }; /************************************************* diff --git a/src/core/model/length.h b/src/core/model/length.h index 09b52dbbd..f89934471 100644 --- a/src/core/model/length.h +++ b/src/core/model/length.h @@ -607,6 +607,8 @@ class Length private: double m_value; //!< Length in meters + + // end of class Length }; ATTRIBUTE_HELPER_HEADER(Length); diff --git a/src/core/model/log.h b/src/core/model/log.h index 2c81a657f..cd8f397f5 100644 --- a/src/core/model/log.h +++ b/src/core/model/log.h @@ -410,7 +410,8 @@ class LogComponent std::string m_name; //!< LogComponent name. std::string m_file; //!< File defining this LogComponent. -}; // class LogComponent + // end of class LogComponent +}; /** * Get the LogComponent registered with the given name. @@ -458,6 +459,8 @@ class ParameterLogger bool m_first{true}; //!< First argument flag, doesn't get `, `. std::ostream& m_os; //!< Underlying output stream. + + // end of class ParameterLogger }; template diff --git a/src/core/model/nstime.h b/src/core/model/nstime.h index f1b6b456c..2eabddce3 100644 --- a/src/core/model/nstime.h +++ b/src/core/model/nstime.h @@ -850,7 +850,8 @@ class Time int64_t m_data; //!< Virtual time value, in the current unit. -}; // class Time + // end of class Time +}; namespace TracedValueCallback { @@ -1498,7 +1499,8 @@ class TimeWithUnit */ friend std::ostream& operator<<(std::ostream& os, const TimeWithUnit& timeU); -}; // class TimeWithUnit + // end of class TimeWithUnit +}; /** * @ingroup time diff --git a/src/core/model/priority-queue-scheduler.h b/src/core/model/priority-queue-scheduler.h index 048458c12..c2d78aebd 100644 --- a/src/core/model/priority-queue-scheduler.h +++ b/src/core/model/priority-queue-scheduler.h @@ -88,7 +88,8 @@ class PriorityQueueScheduler : public Scheduler */ bool remove(const Scheduler::Event& ev); - }; // class EventPriorityQueue + // end of class EventPriorityQueue + }; /** The event queue. */ EventPriorityQueue m_queue; diff --git a/src/core/model/random-variable-stream.h b/src/core/model/random-variable-stream.h index 67277660c..d29bbb42a 100644 --- a/src/core/model/random-variable-stream.h +++ b/src/core/model/random-variable-stream.h @@ -160,7 +160,8 @@ class RandomVariableStream : public Object /** The stream number for the RngStream. */ int64_t m_stream; -}; // class RandomVariableStream + // end of class RandomVariableStream +}; /** * @ingroup randomvariable @@ -280,7 +281,8 @@ class UniformRandomVariable : public RandomVariableStream /** The upper bound on values that can be returned by this RNG stream. */ double m_max; -}; // class UniformRandomVariable + // end of class UniformRandomVariable +}; /** * @ingroup randomvariable @@ -335,7 +337,8 @@ class ConstantRandomVariable : public RandomVariableStream /** The constant value returned by this RNG stream. */ double m_constant; -}; // class ConstantRandomVariable + // end of class ConstantRandomVariable +}; /** * @ingroup randomvariable @@ -465,7 +468,8 @@ class SequentialRandomVariable : public RandomVariableStream /** Indicates if the current sequence value has been properly initialized. */ bool m_isCurrentSet; -}; // class SequentialRandomVariable + // end of class SequentialRandomVariable +}; /** * @ingroup randomvariable @@ -590,7 +594,8 @@ class ExponentialRandomVariable : public RandomVariableStream /** The upper bound on values that can be returned by this RNG stream. */ double m_bound; -}; // class ExponentialRandomVariable + // end of class ExponentialRandomVariable +}; /** * @ingroup randomvariable @@ -729,7 +734,8 @@ class ParetoRandomVariable : public RandomVariableStream /** The upper bound on values that can be returned by this RNG stream. */ double m_bound; -}; // class ParetoRandomVariable + // end of class ParetoRandomVariable +}; /** * @ingroup randomvariable @@ -889,7 +895,8 @@ class WeibullRandomVariable : public RandomVariableStream /** The upper bound on values that can be returned by this RNG stream. */ double m_bound; -}; // class WeibullRandomVariable + // end of class WeibullRandomVariable +}; /** * @ingroup randomvariable @@ -1039,7 +1046,8 @@ class NormalRandomVariable : public RandomVariableStream /** The algorithm produces two values at a time. Cache parameters for possible reuse.*/ double m_y; -}; // class NormalRandomVariable + // end of class NormalRandomVariable +}; /** * @ingroup randomvariable @@ -1188,7 +1196,8 @@ class LogNormalRandomVariable : public RandomVariableStream /** The algorithm produces two values at a time. Cache parameters for possible reuse.*/ double m_normal; -}; // class LogNormalRandomVariable + // end of class LogNormalRandomVariable +}; /** * @ingroup randomvariable @@ -1310,7 +1319,8 @@ class GammaRandomVariable : public RandomVariableStream /** The algorithm produces two values at a time. Cache parameters for possible reuse.*/ double m_y; -}; // class GammaRandomVariable + // end of class GammaRandomVariable +}; /** * @ingroup randomvariable @@ -1435,7 +1445,8 @@ class ErlangRandomVariable : public RandomVariableStream /** The lambda value for the Erlang distribution returned by this RNG stream. */ double m_lambda; -}; // class ErlangRandomVariable + // end of class ErlangRandomVariable +}; /** * @ingroup randomvariable @@ -1566,7 +1577,8 @@ class TriangularRandomVariable : public RandomVariableStream /** The upper bound on values that can be returned by this RNG stream. */ double m_max; -}; // class TriangularRandomVariable + // end of class TriangularRandomVariable +}; /** * @ingroup randomvariable @@ -1693,7 +1705,8 @@ class ZipfRandomVariable : public RandomVariableStream /** The normalization constant. */ double m_c; -}; // class ZipfRandomVariable + // end of class ZipfRandomVariable +}; /** * @ingroup randomvariable @@ -1795,7 +1808,8 @@ class ZetaRandomVariable : public RandomVariableStream /** Just for calculus simplifications. */ double m_b; -}; // class ZetaRandomVariable + // end of class ZetaRandomVariable +}; /** * @ingroup randomvariable @@ -1882,7 +1896,8 @@ class DeterministicRandomVariable : public RandomVariableStream /** Array of values to return in sequence. */ double* m_data; -}; // class DeterministicRandomVariable + // end of class DeterministicRandomVariable +}; /** * @ingroup randomvariable @@ -2075,7 +2090,8 @@ class EmpiricalRandomVariable : public RandomVariableStream */ bool m_interpolate; -}; // class EmpiricalRandomVariable + // end of class EmpiricalRandomVariable +}; /** * @ingroup randomvariable @@ -2178,7 +2194,8 @@ class BinomialRandomVariable : public RandomVariableStream /** The probability of success in each trial. */ double m_probability; -}; // class BinomialRandomVariable + // end of class BinomialRandomVariable +}; /** * @ingroup randomvariable @@ -2271,7 +2288,8 @@ class BernoulliRandomVariable : public RandomVariableStream /** The probability of success. */ double m_probability; -}; // class BernoulliRandomVariable + // end of class BernoulliRandomVariable +}; /** * @ingroup randomvariable @@ -2377,7 +2395,8 @@ class LaplacianRandomVariable : public RandomVariableStream /** The bound on values that can be returned by this RNG stream. */ double m_bound; -}; // class LaplacianRandomVariable + // end of class LaplacianRandomVariable +}; /** * @ingroup randomvariable @@ -2499,7 +2518,8 @@ class LargestExtremeValueRandomVariable : public RandomVariableStream /** The scale value of the Largest Extreme Value distribution. */ double m_scale; -}; // class LargestExtremeValueRandomVariable + // end of class LargestExtremeValueRandomVariable +}; } // namespace ns3 diff --git a/src/core/model/simulator.h b/src/core/model/simulator.h index f2e54163d..7fcb69d41 100644 --- a/src/core/model/simulator.h +++ b/src/core/model/simulator.h @@ -521,6 +521,8 @@ class Simulator * Stop event (if present) */ static EventId m_stopEvent; + + // end of class Simulator }; /** diff --git a/src/core/test/environment-variable-test-suite.cc b/src/core/test/environment-variable-test-suite.cc index d3a41f2e9..17d4dd761 100644 --- a/src/core/test/environment-variable-test-suite.cc +++ b/src/core/test/environment-variable-test-suite.cc @@ -110,7 +110,8 @@ class EnvVarTestCase : public TestCase /** Test environment variable name. */ const std::string m_variable{"NS_ENVVAR_TEST"}; -}; // class EnvVarTestCase + // end of class EnvVarTestCase +}; EnvVarTestCase::EnvVarTestCase() : TestCase("environment-variable-cache") diff --git a/src/core/test/hash-test-suite.cc b/src/core/test/hash-test-suite.cc index d1d1a1c70..12876ec2d 100644 --- a/src/core/test/hash-test-suite.cc +++ b/src/core/test/hash-test-suite.cc @@ -76,7 +76,8 @@ class HashTestCase : public TestCase void Check(const std::string hashName, const int bits, const uint64_t hash); void DoRun() override; -}; // class HashTestCase + // end of class HashTestCase +}; HashTestCase::HashTestCase(const std::string name) : TestCase(name), diff --git a/src/core/test/random-variable-stream-test-suite.cc b/src/core/test/random-variable-stream-test-suite.cc index b4556f47a..5ca14fdb8 100644 --- a/src/core/test/random-variable-stream-test-suite.cc +++ b/src/core/test/random-variable-stream-test-suite.cc @@ -352,7 +352,8 @@ class TestCaseBase : public TestCase /** \c true if we've already set the seed the correctly. */ bool m_seedSet = false; -}; // class TestCaseBase + // end of class TestCaseBase +}; /** * @ingroup rng-tests diff --git a/src/core/test/splitstring-test-suite.cc b/src/core/test/splitstring-test-suite.cc index ed6aac513..08e560c8e 100644 --- a/src/core/test/splitstring-test-suite.cc +++ b/src/core/test/splitstring-test-suite.cc @@ -56,7 +56,8 @@ class SplitStringTestCase : public TestCase /** Test suite delimiter. */ const std::string m_delimiter{":|:"}; -}; // class SplitStringTestCase + // end of class SplitStringTestCase +}; SplitStringTestCase::SplitStringTestCase() : TestCase("split-string") diff --git a/src/lte/model/lte-anr-sap.h b/src/lte/model/lte-anr-sap.h index b83199fc2..eae6856c0 100644 --- a/src/lte/model/lte-anr-sap.h +++ b/src/lte/model/lte-anr-sap.h @@ -132,7 +132,8 @@ class MemberLteAnrSapProvider : public LteAnrSapProvider private: C* m_owner; ///< the owner class -}; // end of class MemberLteAnrSapProvider + // end of class MemberLteAnrSapProvider +}; template MemberLteAnrSapProvider::MemberLteAnrSapProvider(C* owner) @@ -199,7 +200,8 @@ class MemberLteAnrSapUser : public LteAnrSapUser private: C* m_owner; ///< the owner class -}; // end of class MemberLteAnrSapUser + // end of class MemberLteAnrSapUser +}; template MemberLteAnrSapUser::MemberLteAnrSapUser(C* owner) diff --git a/src/lte/model/lte-control-messages.h b/src/lte/model/lte-control-messages.h index bbe5b5250..5c999d0e7 100644 --- a/src/lte/model/lte-control-messages.h +++ b/src/lte/model/lte-control-messages.h @@ -341,7 +341,8 @@ class MibLteControlMessage : public LteControlMessage private: LteRrcSap::MasterInformationBlock m_mib; ///< MIB -}; // end of class MibLteControlMessage + // end of class MibLteControlMessage +}; // --------------------------------------------------------------------------- @@ -379,7 +380,8 @@ class Sib1LteControlMessage : public LteControlMessage private: LteRrcSap::SystemInformationBlockType1 m_sib1; ///< SIB1 -}; // end of class Sib1LteControlMessage + // end of class Sib1LteControlMessage +}; } // namespace ns3 diff --git a/src/lte/model/lte-enb-rrc.h b/src/lte/model/lte-enb-rrc.h index e9a3cfa57..0bf2d8124 100644 --- a/src/lte/model/lte-enb-rrc.h +++ b/src/lte/model/lte-enb-rrc.h @@ -1768,14 +1768,17 @@ class LteEnbRrc : public Object */ TracedCallback m_handoverFailureJoiningTrace; - uint16_t m_numberOfComponentCarriers; ///< number of component carriers + /// Number of component carriers + uint16_t m_numberOfComponentCarriers; - bool m_carriersConfigured; ///< are carriers configured + /// Are carriers configured + bool m_carriersConfigured; - std::map> - m_componentCarrierPhyConf; ///< component carrier phy configuration + /// Component carrier phy configuration + std::map> m_componentCarrierPhyConf; -}; // end of `class LteEnbRrc` + // end of `class LteEnbRrc` +}; /** * @brief Stream insertion operator. diff --git a/src/lte/model/lte-ffr-rrc-sap.h b/src/lte/model/lte-ffr-rrc-sap.h index 76cfb50fe..d4cc0ffa2 100644 --- a/src/lte/model/lte-ffr-rrc-sap.h +++ b/src/lte/model/lte-ffr-rrc-sap.h @@ -148,7 +148,8 @@ class MemberLteFfrRrcSapProvider : public LteFfrRrcSapProvider private: C* m_owner; ///< the owner class -}; // end of class MemberLteFfrRrcSapProvider + // end of class MemberLteFfrRrcSapProvider +}; template MemberLteFfrRrcSapProvider::MemberLteFfrRrcSapProvider(C* owner) @@ -214,7 +215,8 @@ class MemberLteFfrRrcSapUser : public LteFfrRrcSapUser private: C* m_owner; ///< the owner class -}; // end of class LteFfrRrcSapUser + // end of class LteFfrRrcSapUser +}; template MemberLteFfrRrcSapUser::MemberLteFfrRrcSapUser(C* owner) diff --git a/src/lte/model/lte-ffr-sap.h b/src/lte/model/lte-ffr-sap.h index 27dbc766a..3a7019717 100644 --- a/src/lte/model/lte-ffr-sap.h +++ b/src/lte/model/lte-ffr-sap.h @@ -165,7 +165,8 @@ class MemberLteFfrSapProvider : public LteFfrSapProvider private: C* m_owner; ///< the owner class -}; // end of class MemberLteFfrSapProvider + // end of class MemberLteFfrSapProvider +}; template MemberLteFfrSapProvider::MemberLteFfrSapProvider(C* owner) @@ -260,7 +261,8 @@ class MemberLteFfrSapUser : public LteFfrSapUser private: C* m_owner; ///< the owner class -}; // end of class LteFfrSapUser + // end of class LteFfrSapUser +}; template MemberLteFfrSapUser::MemberLteFfrSapUser(C* owner) diff --git a/src/lte/model/lte-handover-management-sap.h b/src/lte/model/lte-handover-management-sap.h index 822175403..bca704f91 100644 --- a/src/lte/model/lte-handover-management-sap.h +++ b/src/lte/model/lte-handover-management-sap.h @@ -116,7 +116,8 @@ class MemberLteHandoverManagementSapProvider : public LteHandoverManagementSapPr private: C* m_owner; ///< the owner class -}; // end of class MemberLteHandoverManagementSapProvider + // end of class MemberLteHandoverManagementSapProvider +}; template MemberLteHandoverManagementSapProvider::MemberLteHandoverManagementSapProvider(C* owner) @@ -159,7 +160,8 @@ class MemberLteHandoverManagementSapUser : public LteHandoverManagementSapUser private: C* m_owner; ///< the owner class -}; // end of class MemberLteAnrSapUser + // end of class MemberLteAnrSapUser +}; template MemberLteHandoverManagementSapUser::MemberLteHandoverManagementSapUser(C* owner) diff --git a/src/lte/model/no-op-component-carrier-manager.h b/src/lte/model/no-op-component-carrier-manager.h index 9ab7ee6c6..ed87d3862 100644 --- a/src/lte/model/no-op-component-carrier-manager.h +++ b/src/lte/model/no-op-component-carrier-manager.h @@ -148,10 +148,11 @@ class NoOpComponentCarrierManager : public LteEnbComponentCarrierManager virtual void DoNotifyPrbOccupancy(double prbOccupancy, uint8_t componentCarrierId); protected: - std::map - m_ccPrbOccupancy; //!< The physical resource block occupancy per carrier. + /// The physical resource block occupancy per carrier. + std::map m_ccPrbOccupancy; -}; // end of class NoOpComponentCarrierManager + // end of class NoOpComponentCarrierManager +}; /** * @brief Component carrier manager implementation that splits traffic equally among carriers. @@ -175,7 +176,9 @@ class RrComponentCarrierManager : public NoOpComponentCarrierManager private: uint8_t m_lastCcIdForSr{0}; //!< Last CCID to which a SR was routed -}; // end of class RrComponentCarrierManager + + // end of class RrComponentCarrierManager +}; } // end of namespace ns3 diff --git a/src/lte/test/lte-test-ue-measurements.h b/src/lte/test/lte-test-ue-measurements.h index d907b04a2..f12864b70 100644 --- a/src/lte/test/lte-test-ue-measurements.h +++ b/src/lte/test/lte-test-ue-measurements.h @@ -244,7 +244,8 @@ class LteUeMeasurementsPiecewiseTestCase1 : public TestCase Ptr m_ueMobility; ///< the mobility model -}; // end of class LteUeMeasurementsPiecewiseTestCase1 + // end of class LteUeMeasurementsPiecewiseTestCase1 +}; // ===== LTE-UE-MEASUREMENTS-PIECEWISE-2 TEST SUITE ======================== // @@ -379,7 +380,8 @@ class LteUeMeasurementsPiecewiseTestCase2 : public TestCase Ptr m_ueMobility; ///< the mobility model -}; // end of class LteUeMeasurementsPiecewiseTestCase2 + // end of class LteUeMeasurementsPiecewiseTestCase2 +}; // ===== LTE-UE-MEASUREMENTS-PIECEWISE-3 TEST SUITE ======================== // @@ -512,7 +514,8 @@ class LteUeMeasurementsPiecewiseTestCase3 : public TestCase Ptr m_enbMobility; ///< the mobility model -}; // end of class LteUeMeasurementsPiecewiseTestCase3 + // end of class LteUeMeasurementsPiecewiseTestCase3 +}; // ===== LTE-UE-MEASUREMENTS-HANDOVER TEST SUITE =========================== // diff --git a/src/lte/test/test-lte-handover-failure.cc b/src/lte/test/test-lte-handover-failure.cc index 2dbcafeb5..98bcbed83 100644 --- a/src/lte/test/test-lte-handover-failure.cc +++ b/src/lte/test/test-lte-handover-failure.cc @@ -191,7 +191,8 @@ class LteHandoverFailureTestCase : public TestCase uint16_t m_targeteNodeBPosition; ///< position of the target eNodeB bool m_hasHandoverFailureOccurred; ///< has handover failure occurred in simulation -}; // end of class LteHandoverFailureTestCase + // end of class LteHandoverFailureTestCase +}; void LteHandoverFailureTestCase::DoRun() diff --git a/src/lte/test/test-lte-handover-target.cc b/src/lte/test/test-lte-handover-target.cc index 670785955..69c325676 100644 --- a/src/lte/test/test-lte-handover-target.cc +++ b/src/lte/test/test-lte-handover-target.cc @@ -129,7 +129,8 @@ class LteHandoverTargetTestCase : public TestCase Ptr m_sourceEnbDev; ///< source ENB device bool m_hasHandoverOccurred; ///< has handover occurred? -}; // end of class LteHandoverTargetTestCase + // end of class LteHandoverTargetTestCase +}; LteHandoverTargetTestCase::LteHandoverTargetTestCase(std::string name, Vector uePosition, diff --git a/src/mpi/test/mpi-test-suite.cc b/src/mpi/test/mpi-test-suite.cc index cdca7d470..e8347025a 100644 --- a/src/mpi/test/mpi-test-suite.cc +++ b/src/mpi/test/mpi-test-suite.cc @@ -112,7 +112,8 @@ class MpiTestSuite : public TestSuite AddTestCase(new MpiTestCase(name, program, dataDir, ranks, args, shouldNotErr), duration); } -}; // class MpiTestSuite + // end of class MpiTestSuite +}; /* Tests using SimpleDistributedSimulatorImpl */ static MpiTestSuite g_mpiNms2("mpi-example-nms-2", "nms-p2p-nix-distributed", NS_TEST_SOURCEDIR, 2); diff --git a/src/test/traced/traced-value-callback-typedef-test-suite.cc b/src/test/traced/traced-value-callback-typedef-test-suite.cc index 38fd7b628..ad9a788e8 100644 --- a/src/test/traced/traced-value-callback-typedef-test-suite.cc +++ b/src/test/traced/traced-value-callback-typedef-test-suite.cc @@ -188,7 +188,8 @@ class TracedValueCallbackTestCase : public TestCase } // Invoke() - }; // class CheckTvCb + // end of class CheckTvCb + }; /** * Check the TracedValue typedef against TracedValueCbSink. diff --git a/src/uan/model/uan-header-rc.h b/src/uan/model/uan-header-rc.h index c7ca2c35b..7f8c943fa 100644 --- a/src/uan/model/uan-header-rc.h +++ b/src/uan/model/uan-header-rc.h @@ -93,7 +93,8 @@ class UanHeaderRcData : public Header uint8_t m_frameNo; //!< Data frame number. Time m_propDelay; //!< Propagation delay. -}; // class UanHeaderRcData + // end of class UanHeaderRcData +}; /** * @ingroup uan @@ -214,7 +215,8 @@ class UanHeaderRcRts : public Header Time m_timeStamp; //!< RTS TX timestamp. uint8_t m_retryNo; //!< Retry number of RTS packet. -}; // class UanHeaderRcRts + // end of class UanHeaderRcRts +}; /** * @ingroup uan @@ -317,7 +319,8 @@ class UanHeaderRcCtsGlobal : public Header uint16_t m_retryRate; //!< Retry rate. uint16_t m_rateNum; //!< Rate number. -}; // class UanHeaderRcCtsGlobal + // end of class UanHeaderRcCtsGlobal +}; /** * @ingroup uan @@ -436,7 +439,8 @@ class UanHeaderRcCts : public Header Time m_delay; //!< Delay until transmission. Mac8Address m_address; //!< Destination of CTS packet. -}; // class UanHeaderRcCts + // end of class UanHeaderRcCts +}; /** * @ingroup uan @@ -500,7 +504,8 @@ class UanHeaderRcAck : public Header uint8_t m_frameNo; //!< Next frame number. std::set m_nackedFrames; //!< Marker for nacked frames. -}; // class UanHeaderRcAck + // end of class UanHeaderRcAck +}; } // namespace ns3 diff --git a/src/uan/model/uan-mac-rc.h b/src/uan/model/uan-mac-rc.h index 593ddb76e..11ffc38d1 100644 --- a/src/uan/model/uan-mac-rc.h +++ b/src/uan/model/uan-mac-rc.h @@ -132,7 +132,8 @@ class Reservation /** Has this reservation been transmitted. */ bool m_transmitted; -}; // class Reservation + // end of class Reservation +}; /** * @ingroup uan @@ -306,7 +307,8 @@ class UanMacRc : public UanMac protected: void DoDispose() override; -}; // class UanMacRc + // end of class UanMacRc +}; } // namespace ns3 diff --git a/src/uan/model/uan-phy-dual.h b/src/uan/model/uan-phy-dual.h index ad6a5fe32..8daa74d93 100644 --- a/src/uan/model/uan-phy-dual.h +++ b/src/uan/model/uan-phy-dual.h @@ -47,7 +47,8 @@ class UanPhyCalcSinrDual : public UanPhyCalcSinr UanPdp pdp, const UanTransducer::ArrivalList& arrivalList) const override; -}; // class UanPhyCalcSinrDual + // end of class UanPhyCalcSinrDual +}; /** * @ingroup uan @@ -257,7 +258,8 @@ class UanPhyDual : public UanPhy protected: void DoDispose() override; -}; // class UanPhyDual + // end of class UanPhyDual +}; } // namespace ns3 diff --git a/src/uan/model/uan-phy-gen.h b/src/uan/model/uan-phy-gen.h index 34789fd76..3a9b056ec 100644 --- a/src/uan/model/uan-phy-gen.h +++ b/src/uan/model/uan-phy-gen.h @@ -50,7 +50,8 @@ class UanPhyPerGenDefault : public UanPhyPer private: double m_thresh; //!< SINR threshold. -}; // class UanPhyPerGenDefault + // end of class UanPhyPerGenDefault +}; /** * @ingroup uan @@ -102,7 +103,8 @@ class UanPhyPerUmodem : public UanPhyPer */ double NChooseK(uint32_t n, uint32_t k); -}; // class UanPhyPerUmodem + // end of class UanPhyPerUmodem +}; /** * @ingroup uan @@ -140,7 +142,8 @@ class UanPhyPerCommonModes : public UanPhyPer */ double CalcPer(Ptr pkt, double sinrDb, UanTxMode mode) override; -}; // class UanPhyPerCommonModes + // end of class UanPhyPerCommonModes +}; /** * @ingroup uan @@ -188,7 +191,8 @@ class UanPhyCalcSinrDefault : public UanPhyCalcSinr UanPdp pdp, const UanTransducer::ArrivalList& arrivalList) const override; -}; // class UanPhyCalcSinrDefault + // end of class UanPhyCalcSinrDefault +}; /** * @ingroup uan @@ -234,7 +238,8 @@ class UanPhyCalcSinrFhFsk : public UanPhyCalcSinr private: uint32_t m_hops; //!< Number of hops. -}; // class UanPhyCalcSinrFhFsk + // class UanPhyCalcSinrFhFsk +}; /** * @ingroup uan @@ -435,7 +440,8 @@ class UanPhyGen : public UanPhy protected: void DoDispose() override; -}; // class UanPhyGen + // end of class UanPhyGen +}; } // namespace ns3 diff --git a/src/uan/model/uan-phy.h b/src/uan/model/uan-phy.h index b71f6fda0..9c50ef38c 100644 --- a/src/uan/model/uan-phy.h +++ b/src/uan/model/uan-phy.h @@ -85,7 +85,8 @@ class UanPhyCalcSinr : public Object protected: void DoDispose() override; -}; // class UanPhyCalcSinr + // end of class UanPhyCalcSinr +}; /** * @ingroup uan @@ -120,7 +121,8 @@ class UanPhyPer : public Object protected: void DoDispose() override; -}; // class UanPhyPer + // end of class UanPhyPer +}; /** * @ingroup uan @@ -156,7 +158,9 @@ class UanPhyListener virtual void NotifyTxStart(Time duration) = 0; /** Function called when Phy object finishes transmitting packet */ virtual void NotifyTxEnd() = 0; -}; // class UanPhyListener + + // end of class UanPhyListener +}; /** * @ingroup uan @@ -540,7 +544,8 @@ class UanPhy : public Object */ ns3::TracedCallback> m_phyRxDropTrace; -}; // class UanPhy + // end of class UanPhy +}; } // namespace ns3 diff --git a/src/uan/model/uan-prop-model.h b/src/uan/model/uan-prop-model.h index 753db6aad..b764135a4 100644 --- a/src/uan/model/uan-prop-model.h +++ b/src/uan/model/uan-prop-model.h @@ -57,7 +57,8 @@ class Tap std::complex m_amplitude; //!< The amplitude. Time m_delay; //!< The time delay. -}; // class Tap + // end of class Tap +}; /** * @ingroup uan @@ -240,7 +241,8 @@ class UanPdp std::vector m_taps; //!< The vector of Taps. Time m_resolution; //!< The time resolution. -}; // class UanPdp + // end of class UanPdp +}; /** * @ingroup uan @@ -311,7 +313,8 @@ class UanPropModel : public Object void DoDispose() override; -}; // class UanPropModel + // end of class UanPropModel +}; } // namespace ns3 diff --git a/src/uan/model/uan-transducer.h b/src/uan/model/uan-transducer.h index cbe1f5db1..bca6b0898 100644 --- a/src/uan/model/uan-transducer.h +++ b/src/uan/model/uan-transducer.h @@ -121,7 +121,8 @@ class UanPacketArrival UanPdp m_pdp; //!< The propagation delay profile. Time m_arrTime; //!< The arrival time. -}; // class UanPacketArrival + // end of class UanPacketArrival +}; /** * @ingroup uan @@ -251,7 +252,8 @@ class UanTransducer : public Object */ virtual void Clear() = 0; -}; // class UanTransducer + // end of class UanTransducer +}; } // namespace ns3 diff --git a/src/uan/model/uan-tx-mode.h b/src/uan/model/uan-tx-mode.h index fc08c2dc6..eb695decf 100644 --- a/src/uan/model/uan-tx-mode.h +++ b/src/uan/model/uan-tx-mode.h @@ -101,7 +101,8 @@ class UanTxMode friend std::ostream& operator<<(std::ostream& os, const UanTxMode& mode); friend std::istream& operator>>(std::istream& is, UanTxMode& mode); -}; // class UanTxMode + // end of class UanTxMode +}; /** * Writes tx mode entry to stream os. @@ -235,7 +236,8 @@ class UanTxModeFactory */ UanTxMode MakeModeFromItem(const UanTxModeItem& item); -}; // class UanTxModeFactory + // end of class UanTxModeFactory +}; /** * @ingroup uan @@ -281,7 +283,8 @@ class UanModesList friend std::ostream& operator<<(std::ostream& os, const UanModesList& ml); friend std::istream& operator>>(std::istream& is, UanModesList& ml); -}; // class UanModesList + // end of class UanModesList +}; /** * Write UanModesList to stream os diff --git a/src/wifi/model/ht/ht-ppdu.h b/src/wifi/model/ht/ht-ppdu.h index 0a457feed..08955fcd6 100644 --- a/src/wifi/model/ht/ht-ppdu.h +++ b/src/wifi/model/ht/ht-ppdu.h @@ -109,7 +109,9 @@ class HtPpdu : public OfdmPpdu uint16_t m_htLength; ///< HT length uint8_t m_aggregation; ///< Aggregation uint8_t m_sgi; ///< Short Guard Interval - }; // HtSigHeader + + // end of class HtSigHeader + }; /** * Create an HT PPDU. diff --git a/src/wifi/model/non-ht/dsss-ppdu.h b/src/wifi/model/non-ht/dsss-ppdu.h index 75d0e528d..017261ba6 100644 --- a/src/wifi/model/non-ht/dsss-ppdu.h +++ b/src/wifi/model/non-ht/dsss-ppdu.h @@ -70,7 +70,9 @@ class DsssPpdu : public WifiPpdu private: uint8_t m_rate; ///< RATE field uint16_t m_length; ///< LENGTH field - }; // class DsssSigHeader + + // end of class DsssSigHeader + }; /** * Create a DSSS (HR/DSSS) PPDU. diff --git a/src/wifi/model/non-ht/ofdm-ppdu.h b/src/wifi/model/non-ht/ofdm-ppdu.h index c8897801e..e7f829cdc 100644 --- a/src/wifi/model/non-ht/ofdm-ppdu.h +++ b/src/wifi/model/non-ht/ofdm-ppdu.h @@ -74,7 +74,9 @@ class OfdmPpdu : public WifiPpdu private: uint8_t m_rate; ///< RATE field uint16_t m_length; ///< LENGTH field - }; // class LSigHeader + + // end of class LSigHeader + }; /** * Create an OFDM PPDU. diff --git a/src/wifi/model/vht/vht-ppdu.h b/src/wifi/model/vht/vht-ppdu.h index e6f6f3bef..f897dada2 100644 --- a/src/wifi/model/vht/vht-ppdu.h +++ b/src/wifi/model/vht/vht-ppdu.h @@ -124,7 +124,9 @@ class VhtPpdu : public OfdmPpdu /// This is used to decide whether MU SIG-B should be added or not bool m_mu; - }; // class VhtSigHeader + + // end of class VhtSigHeader + }; /** * Create a VHT PPDU. diff --git a/src/wifi/test/wifi-non-ht-dup-test.cc b/src/wifi/test/wifi-non-ht-dup-test.cc index 0882b3fa7..5ce1ecd37 100644 --- a/src/wifi/test/wifi-non-ht-dup-test.cc +++ b/src/wifi/test/wifi-non-ht-dup-test.cc @@ -65,7 +65,9 @@ class MuRtsCtsHePhy : public HePhy * @param muRtsTxVector the TXVECTOR used to transmit MU-RTS trigger frame */ void SetMuRtsTxVector(const WifiTxVector& muRtsTxVector); -}; // class MuRtsCtsHePhy + + // end of class MuRtsCtsHePhy +}; MuRtsCtsHePhy::MuRtsCtsHePhy() : HePhy() @@ -126,7 +128,9 @@ class MuRtsCtsSpectrumWifiPhy : public SpectrumWifiPhy private: Ptr m_muRtsCtsHePhy; ///< Pointer to HE PHY instance used for MU-RTS/CTS PHY test -}; // class MuRtsCtsSpectrumWifiPhy + + // end of class MuRtsCtsSpectrumWifiPhy +}; TypeId MuRtsCtsSpectrumWifiPhy::GetTypeId() diff --git a/src/wifi/test/wifi-phy-mu-mimo-test.cc b/src/wifi/test/wifi-phy-mu-mimo-test.cc index eb56ea0a4..b456aaf71 100644 --- a/src/wifi/test/wifi-phy-mu-mimo-test.cc +++ b/src/wifi/test/wifi-phy-mu-mimo-test.cc @@ -203,7 +203,9 @@ class MuMimoTestHePhy : public HePhy private: uint16_t m_staId; ///< ID of the STA to which this PHY belongs to -}; // class MuMimoTestHePhy + + // end of class MuMimoTestHePhy +}; MuMimoTestHePhy::MuMimoTestHePhy(uint16_t staId) : HePhy(), @@ -270,7 +272,9 @@ class MuMimoSpectrumWifiPhy : public SpectrumWifiPhy void DoDispose() override; Ptr m_ofdmTestHePhy; ///< Pointer to HE PHY instance used for MU-MIMO test -}; // class MuMimoSpectrumWifiPhy + + // end of class MuMimoSpectrumWifiPhy +}; TypeId MuMimoSpectrumWifiPhy::GetTypeId() diff --git a/src/wifi/test/wifi-phy-ofdma-test.cc b/src/wifi/test/wifi-phy-ofdma-test.cc index bb7932672..f7233cacc 100644 --- a/src/wifi/test/wifi-phy-ofdma-test.cc +++ b/src/wifi/test/wifi-phy-ofdma-test.cc @@ -89,7 +89,9 @@ class OfdmaTestHePhy : public HePhy private: uint16_t m_staId; ///< ID of the STA to which this PHY belongs to -}; // class OfdmaTestHePhy + + // end of class OfdmaTestHePhy +}; OfdmaTestHePhy::OfdmaTestHePhy(uint16_t staId) : HePhy(), @@ -190,10 +192,14 @@ class OfdmaSpectrumWifiPhy : public SpectrumWifiPhy Ptr GetHePhy() const; private: - Ptr m_ofdmTestHePhy; ///< Pointer to HE PHY instance used for OFDMA test - TracedCallback - m_phyTxPpduUidTrace; //!< Callback providing UID of the PPDU that is about to be transmitted -}; // class OfdmaSpectrumWifiPhy + /// Pointer to HE PHY instance used for OFDMA test + Ptr m_ofdmTestHePhy; + + /// Callback providing UID of the PPDU that is about to be transmitted + TracedCallback m_phyTxPpduUidTrace; + + // end of class OfdmaSpectrumWifiPhy +}; TypeId OfdmaSpectrumWifiPhy::GetTypeId() diff --git a/utils/print-introspected-doxygen.cc b/utils/print-introspected-doxygen.cc index 8aff8fa45..ca96d1e69 100644 --- a/utils/print-introspected-doxygen.cc +++ b/utils/print-introspected-doxygen.cc @@ -313,7 +313,8 @@ class StaticInformation */ mutable std::vector m_noTids; -}; // class StaticInformation + // end of class StaticInformation +}; void StaticInformation::RecordAggregationInfo(std::string a, std::string b)