Another set of refactoring
diff --git a/utils/detail/functor-hook.h b/utils/detail/functor-hook.h
index 63dcffd..f34969c 100644
--- a/utils/detail/functor-hook.h
+++ b/utils/detail/functor-hook.h
@@ -23,12 +23,10 @@
#include <boost/intrusive/parent_from_member.hpp>
-namespace ns3
-{
-namespace ndnSIM
-{
-namespace detail
-{
+namespace ns3 {
+namespace ndn {
+namespace ndnSIM {
+namespace detail {
template<class BaseHook, class ValueType, int N>
struct FunctorHook
@@ -66,6 +64,7 @@
} // detail
} // ndnSIM
+} // ndn
} // ns3
#endif // FUNCTOR_HOOK_H_
diff --git a/utils/detail/multi-policy-container.h b/utils/detail/multi-policy-container.h
index 7272a01..35119cb 100644
--- a/utils/detail/multi-policy-container.h
+++ b/utils/detail/multi-policy-container.h
@@ -24,12 +24,10 @@
#include <boost/mpl/inherit_linearly.hpp>
#include <boost/mpl/at.hpp>
-namespace ns3
-{
-namespace ndnSIM
-{
-namespace detail
-{
+namespace ns3 {
+namespace ndn {
+namespace ndnSIM {
+namespace detail {
template< class Base, class Value >
struct policy_wrap
@@ -160,6 +158,7 @@
} // detail
} // ndnSIM
+} // ndn
} // ns3
#endif // MULTI_POLICY_CONTAINER_H_
diff --git a/utils/detail/multi-type-container.h b/utils/detail/multi-type-container.h
index 24bf17c..d4971c4 100644
--- a/utils/detail/multi-type-container.h
+++ b/utils/detail/multi-type-container.h
@@ -25,12 +25,10 @@
#include <boost/mpl/inherit.hpp>
#include <boost/mpl/at.hpp>
-namespace ns3
-{
-namespace ndnSIM
-{
-namespace detail
-{
+namespace ns3 {
+namespace ndn {
+namespace ndnSIM {
+namespace detail {
template <class T>
struct wrap
@@ -82,6 +80,7 @@
} // detail
} // ndnSIM
+} // ndn
} // ns3
#endif // MULTI_TYPE_CONTAINER_H_