Normalizing namespace usage (ndnSIM namespace is now always under ns3)
diff --git a/utils/detail/functor-hook.h b/utils/detail/functor-hook.h
index 94b8b8f..63dcffd 100644
--- a/utils/detail/functor-hook.h
+++ b/utils/detail/functor-hook.h
@@ -23,6 +23,8 @@
 
 #include <boost/intrusive/parent_from_member.hpp>
 
+namespace ns3
+{
 namespace ndnSIM
 {
 namespace detail
@@ -64,5 +66,6 @@
 
 } // detail
 } // ndnSIM
+} // ns3
 
 #endif // FUNCTOR_HOOK_H_
diff --git a/utils/detail/multi-policy-container.h b/utils/detail/multi-policy-container.h
index 0fa07b3..7272a01 100644
--- a/utils/detail/multi-policy-container.h
+++ b/utils/detail/multi-policy-container.h
@@ -24,6 +24,8 @@
 #include <boost/mpl/inherit_linearly.hpp>
 #include <boost/mpl/at.hpp>
 
+namespace ns3
+{
 namespace ndnSIM
 {
 namespace detail
@@ -158,5 +160,6 @@
 
 } // detail
 } // ndnSIM
+} // ns3
 
 #endif // MULTI_POLICY_CONTAINER_H_
diff --git a/utils/detail/multi-type-container.h b/utils/detail/multi-type-container.h
index 43a25da..24bf17c 100644
--- a/utils/detail/multi-type-container.h
+++ b/utils/detail/multi-type-container.h
@@ -25,6 +25,8 @@
 #include <boost/mpl/inherit.hpp>
 #include <boost/mpl/at.hpp>
 
+namespace ns3
+{
 namespace ndnSIM
 {
 namespace detail
@@ -80,5 +82,6 @@
   
 } // detail
 } // ndnSIM
+} // ns3
 
 #endif // MULTI_TYPE_CONTAINER_H_