--- a/RELEASE_NOTES Mon Apr 28 22:14:15 2014 +0200
+++ b/RELEASE_NOTES Tue Apr 29 09:50:21 2014 +0200
@@ -76,6 +76,7 @@
- Bug 1889 - PointToPointNetDevive: In some cases MacTxDrop trace is not called
- Bug 1890 - UdpClientTrace: MPEG frame size is squeezed into (insufficient) 16 bit integer
- Bug 1891 - UdpSocketImpl::GetSockName doesn't return the IPv6 address
+- Bug 1903 - Namespace usage in olsr-state.cc/h
Release 3.19
=============
--- a/src/olsr/model/olsr-state.cc Mon Apr 28 22:14:15 2014 +0200
+++ b/src/olsr/model/olsr-state.cc Tue Apr 29 09:50:21 2014 +0200
@@ -30,7 +30,7 @@
namespace ns3 {
-
+namespace olsr {
/********** MPR Selector Set Manipulation **********/
@@ -543,4 +543,4 @@
m_associations.push_back (tuple);
}
-} // namespace ns3
+}} // namespace olsr, ns3
--- a/src/olsr/model/olsr-state.h Mon Apr 28 22:14:15 2014 +0200
+++ b/src/olsr/model/olsr-state.h Tue Apr 29 09:50:21 2014 +0200
@@ -28,8 +28,7 @@
#include "olsr-repositories.h"
namespace ns3 {
-
-using namespace olsr;
+namespace olsr {
/// This class encapsulates all data structures needed for maintaining internal state of an OLSR node.
class OlsrState
@@ -175,6 +174,6 @@
};
-} // namespace ns3
+}} // namespace olsr,ns3
#endif /* OLSR_STATE_H */