Cleanup use of namespace specifiers in uan
This commit is contained in:
@@ -34,7 +34,7 @@ namespace ns3 {
|
||||
* Header includes 1 byte src address, 1 byte dest address,
|
||||
* and a 1 byte type field.
|
||||
*/
|
||||
class UanHeaderCommon : public ns3::Header
|
||||
class UanHeaderCommon : public Header
|
||||
{
|
||||
public:
|
||||
UanHeaderCommon ();
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace ns3 {
|
||||
* Adds prop. delay measure, and frame number info to
|
||||
* transmitted data packet
|
||||
*/
|
||||
class UanHeaderRcData : public ns3::Header
|
||||
class UanHeaderRcData : public Header
|
||||
{
|
||||
public:
|
||||
UanHeaderRcData ();
|
||||
@@ -90,7 +90,7 @@ private:
|
||||
*
|
||||
* Contains frame #, retry #, # frames, length, and timestamp
|
||||
*/
|
||||
class UanHeaderRcRts : public ns3::Header
|
||||
class UanHeaderRcRts : public Header
|
||||
{
|
||||
public:
|
||||
UanHeaderRcRts ();
|
||||
@@ -249,7 +249,7 @@ private:
|
||||
* RTS tx period, rate #, and retry rate #
|
||||
*/
|
||||
|
||||
class UanHeaderRcCts : public ns3::Header
|
||||
class UanHeaderRcCts : public Header
|
||||
{
|
||||
public:
|
||||
UanHeaderRcCts ();
|
||||
|
||||
@@ -39,7 +39,7 @@ class UanTxMode;
|
||||
* are immediately transmitted. This MAC attaches a UanHeaderCommon
|
||||
* to outgoing packets for address information. (The type field is not used)
|
||||
*/
|
||||
class UanMacAloha : public ns3::UanMac
|
||||
class UanMacAloha : public UanMac
|
||||
{
|
||||
public:
|
||||
UanMacAloha ();
|
||||
|
||||
@@ -40,8 +40,8 @@ namespace ns3 {
|
||||
* "System Design Considerations for Undersea Networks: Link and Multiple Access Protocols,"
|
||||
* Selected Areas in Communications, IEEE Journal on , vol.26, no.9, pp.1720-1730, December 2008
|
||||
*/
|
||||
class UanMacCw : public ns3::UanMac,
|
||||
public ns3::UanPhyListener
|
||||
class UanMacCw : public UanMac,
|
||||
public UanPhyListener
|
||||
{
|
||||
public:
|
||||
UanMacCw ();
|
||||
|
||||
@@ -57,7 +57,7 @@ class UanTxMode;
|
||||
* (This work is, as of yet, unpublished)
|
||||
*/
|
||||
|
||||
class UanMacRcGw : public ns3::UanMac
|
||||
class UanMacRcGw : public UanMac
|
||||
{
|
||||
public:
|
||||
UanMacRcGw ();
|
||||
|
||||
@@ -133,7 +133,7 @@ private:
|
||||
* lentracy@u.washington.edu
|
||||
* (This work is, as of yet, unpublished)
|
||||
*/
|
||||
class UanMacRc : public ns3::UanMac
|
||||
class UanMacRc : public UanMac
|
||||
{
|
||||
public:
|
||||
enum {
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
namespace ns3 {
|
||||
|
||||
class UanNoiseModel : public ns3::Object
|
||||
class UanNoiseModel : public Object
|
||||
{
|
||||
public:
|
||||
/**
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace ns3 {
|
||||
* Can be set to any derived class using attributes of UanPhy
|
||||
* to implement different models.
|
||||
*/
|
||||
class UanPhyCalcSinr : public ns3::Object
|
||||
class UanPhyCalcSinr : public Object
|
||||
{
|
||||
|
||||
public:
|
||||
@@ -84,7 +84,7 @@ public:
|
||||
* Used in UanPhy for determining probability of packet error based on received SINR and
|
||||
* modulation (mode). Can be set in UanPhy via attributes
|
||||
*/
|
||||
class UanPhyPer : public ns3::Object
|
||||
class UanPhyPer : public Object
|
||||
{
|
||||
public:
|
||||
/**
|
||||
@@ -141,7 +141,7 @@ public:
|
||||
*
|
||||
* \brief Base class for UAN Phy models
|
||||
*/
|
||||
class UanPhy : public ns3::Object
|
||||
class UanPhy : public Object
|
||||
{
|
||||
public:
|
||||
/// Enum defining possible Phy states
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace ns3 {
|
||||
*
|
||||
* \brief Ideal propagation model (no pathloss, impulse PDP)
|
||||
*/
|
||||
class UanPropModelIdeal : public ns3::UanPropModel
|
||||
class UanPropModelIdeal : public UanPropModel
|
||||
{
|
||||
public:
|
||||
UanPropModelIdeal ();
|
||||
|
||||
@@ -31,7 +31,7 @@ class UanTxMode;
|
||||
* \class UanPropModelThorp
|
||||
* \brief Uses Thorp's approximation to compute pathloss. Assumes implulse PDP.
|
||||
*/
|
||||
class UanPropModelThorp : public ns3::UanPropModel
|
||||
class UanPropModelThorp : public UanPropModel
|
||||
{
|
||||
public:
|
||||
UanPropModelThorp ();
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace ns3 {
|
||||
*
|
||||
* This class will only allow attached Phy's to receive packets if not in TX mode
|
||||
*/
|
||||
class UanTransducerHd : public ns3::UanTransducer
|
||||
class UanTransducerHd : public UanTransducer
|
||||
{
|
||||
public:
|
||||
UanTransducerHd ();
|
||||
|
||||
Reference in New Issue
Block a user