--- a/src/core/model/boolean.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/core/model/boolean.cc Fri Dec 14 14:07:33 2012 -0800
@@ -49,14 +49,11 @@
}
BooleanValue::operator bool () const
{
- NS_LOG_FUNCTION (this);
return m_value;
}
std::ostream & operator << (std::ostream &os, const BooleanValue &value)
{
- NS_LOG_FUNCTION (&os << &value);
-
if (value.Get ())
{
os << "true";
--- a/src/core/model/callback.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/core/model/callback.cc Fri Dec 14 14:07:33 2012 -0800
@@ -13,7 +13,6 @@
CallbackValue::CallbackValue (const CallbackBase &base)
: m_value (base)
{
- NS_LOG_FUNCTION (&base);
}
CallbackValue::~CallbackValue ()
{
--- a/src/core/model/command-line.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/core/model/command-line.cc Fri Dec 14 14:07:33 2012 -0800
@@ -38,13 +38,11 @@
}
CommandLine::CommandLine (const CommandLine &cmd)
{
- NS_LOG_FUNCTION (&cmd);
Copy (cmd);
}
CommandLine &
CommandLine::operator = (const CommandLine &cmd)
{
- NS_LOG_FUNCTION (&cmd);
Clear ();
Copy (cmd);
return *this;
--- a/src/core/model/event-id.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/core/model/event-id.cc Fri Dec 14 14:07:33 2012 -0800
@@ -88,7 +88,6 @@
bool operator == (const EventId &a, const EventId &b)
{
- NS_LOG_FUNCTION (a.GetUid () << b.GetUid ());
return
a.m_uid == b.m_uid &&
a.m_context == b.m_context &&
@@ -97,7 +96,6 @@
}
bool operator != (const EventId &a, const EventId &b)
{
- NS_LOG_FUNCTION (a.GetUid () << b.GetUid ());
return !(a == b);
}
--- a/src/core/model/names.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/core/model/names.cc Fri Dec 14 14:07:33 2012 -0800
@@ -51,7 +51,6 @@
NameNode::NameNode (const NameNode &nameNode)
{
- NS_LOG_FUNCTION (this << &nameNode);
m_parent = nameNode.m_parent;
m_name = nameNode.m_name;
m_object = nameNode.m_object;
@@ -61,7 +60,6 @@
NameNode &
NameNode::operator = (const NameNode &rhs)
{
- NS_LOG_FUNCTION (this << &rhs);
m_parent = rhs.m_parent;
m_name = rhs.m_name;
m_object = rhs.m_object;
--- a/src/core/model/object-factory.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/core/model/object-factory.cc Fri Dec 14 14:07:33 2012 -0800
@@ -100,7 +100,6 @@
std::ostream & operator << (std::ostream &os, const ObjectFactory &factory)
{
- NS_LOG_FUNCTION (&os << &factory);
os << factory.m_tid.GetName () << "[";
bool first = true;
for (AttributeConstructionList::CIterator i = factory.m_parameters.Begin (); i != factory.m_parameters.End (); ++i)
@@ -116,7 +115,6 @@
}
std::istream & operator >> (std::istream &is, ObjectFactory &factory)
{
- NS_LOG_FUNCTION (&is << &factory);
std::string v;
is >> v;
std::string::size_type lbracket, rbracket;
@@ -129,7 +127,6 @@
}
if (lbracket == std::string::npos || rbracket == std::string::npos)
{
- NS_LOG_DEBUG ("Error while parsing factory specification: mismatching brackets. \"" << v << "\"");
return is;
}
NS_ASSERT (lbracket != std::string::npos);
@@ -145,7 +142,6 @@
if (equal == std::string::npos)
{
is.setstate (std::ios_base::failbit);
- NS_LOG_DEBUG ("Error while parsing serialized attribute: \"" << parameters << "\"");
break;
}
else
@@ -155,7 +151,6 @@
if (!factory.m_tid.LookupAttributeByName (name, &info))
{
is.setstate (std::ios_base::failbit);
- NS_LOG_DEBUG ("Error while parsing serialized attribute: name does not exist: \"" << name << "\"");
break;
}
else
@@ -177,7 +172,6 @@
if (!ok)
{
is.setstate (std::ios_base::failbit);
- NS_LOG_DEBUG ("Error while parsing serialized attribute: value invalid: \"" << value << "\"");
break;
}
else
--- a/src/core/model/object.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/core/model/object.cc Fri Dec 14 14:07:33 2012 -0800
@@ -131,7 +131,6 @@
m_aggregates ((struct Aggregates *) std::malloc (sizeof (struct Aggregates))),
m_getObjectCount (0)
{
- NS_LOG_FUNCTION (&o);
m_aggregates->n = 1;
m_aggregates->buffer[0] = this;
}
--- a/src/core/model/random-variable.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/core/model/random-variable.cc Fri Dec 14 14:07:33 2012 -0800
@@ -113,17 +113,14 @@
RandomVariable::RandomVariable (const RandomVariable&o)
: m_variable (o.m_variable->Copy ())
{
- NS_LOG_FUNCTION (this << o);
}
RandomVariable::RandomVariable (const RandomVariableBase &variable)
: m_variable (variable.Copy ())
{
- NS_LOG_FUNCTION (&variable);
}
RandomVariable &
RandomVariable::operator = (const RandomVariable &o)
{
- NS_LOG_FUNCTION (this << o);
if (&o == this)
{
return *this;
@@ -2018,7 +2015,6 @@
std::ostream & operator << (std::ostream &os, const RandomVariable &var)
{
- NS_LOG_FUNCTION (&os << &var);
RandomVariableBase *base = var.Peek ();
ConstantVariableImpl *constant = dynamic_cast<ConstantVariableImpl *> (base);
if (constant != 0)
@@ -2049,7 +2045,6 @@
}
std::istream & operator >> (std::istream &is, RandomVariable &var)
{
- NS_LOG_FUNCTION (&is << &var);
std::string value;
is >> value;
std::string::size_type tmp;
--- a/src/core/model/test.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/core/model/test.cc Fri Dec 14 14:07:33 2012 -0800
@@ -505,7 +505,6 @@
}
std::ostream &operator << (std::ostream &os, const Indent &val)
{
- NS_LOG_FUNCTION (&os << &val);
for (int i = 0; i < val.level; i++)
{
os << " ";
--- a/src/core/model/type-id.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/core/model/type-id.cc Fri Dec 14 14:07:33 2012 -0800
@@ -677,13 +677,11 @@
std::ostream & operator << (std::ostream &os, TypeId tid)
{
- NS_LOG_FUNCTION (&os << &tid);
os << tid.GetName ();
return os;
}
std::istream & operator >> (std::istream &is, TypeId &tid)
{
- NS_LOG_FUNCTION (&is << &tid);
std::string tidString;
is >> tidString;
bool ok = TypeId::LookupByNameFailSafe (tidString, &tid);
@@ -699,7 +697,6 @@
bool operator < (TypeId a, TypeId b)
{
- NS_LOG_FUNCTION (a << b);
return a.m_tid < b.m_tid;
}
--- a/src/network/model/trailer.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/network/model/trailer.cc Fri Dec 14 14:07:33 2012 -0800
@@ -23,7 +23,6 @@
std::ostream & operator << (std::ostream &os, const Trailer &trailer)
{
- NS_LOG_FUNCTION (&os << &trailer);
trailer.Print (os);
return os;
}
--- a/src/network/utils/data-rate.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/network/utils/data-rate.cc Fri Dec 14 14:07:33 2012 -0800
@@ -198,37 +198,31 @@
bool DataRate::operator < (const DataRate& rhs) const
{
- NS_LOG_FUNCTION (this << rhs);
return m_bps<rhs.m_bps;
}
bool DataRate::operator <= (const DataRate& rhs) const
{
- NS_LOG_FUNCTION (this << rhs);
return m_bps<=rhs.m_bps;
}
bool DataRate::operator > (const DataRate& rhs) const
{
- NS_LOG_FUNCTION (this << rhs);
return m_bps>rhs.m_bps;
}
bool DataRate::operator >= (const DataRate& rhs) const
{
- NS_LOG_FUNCTION (this << rhs);
return m_bps>=rhs.m_bps;
}
bool DataRate::operator == (const DataRate& rhs) const
{
- NS_LOG_FUNCTION (this << rhs);
return m_bps==rhs.m_bps;
}
bool DataRate::operator != (const DataRate& rhs) const
{
- NS_LOG_FUNCTION (this << rhs);
return m_bps!=rhs.m_bps;
}
@@ -256,13 +250,11 @@
std::ostream &operator << (std::ostream &os, const DataRate &rate)
{
- NS_LOG_FUNCTION (&os << rate);
os << rate.GetBitRate () << "bps";
return os;
}
std::istream &operator >> (std::istream &is, DataRate &rate)
{
- NS_LOG_FUNCTION (&is << &rate);
std::string value;
is >> value;
uint64_t v;
@@ -279,13 +271,11 @@
double operator* (const DataRate& lhs, const Time& rhs)
{
- NS_LOG_FUNCTION (lhs << rhs);
return rhs.GetSeconds ()*lhs.GetBitRate ();
}
double operator* (const Time& lhs, const DataRate& rhs)
{
- NS_LOG_FUNCTION (lhs << rhs);
return lhs.GetSeconds ()*rhs.GetBitRate ();
}
--- a/src/network/utils/inet-socket-address.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/network/utils/inet-socket-address.cc Fri Dec 14 14:07:33 2012 -0800
@@ -91,7 +91,6 @@
InetSocketAddress::operator Address () const
{
- NS_LOG_FUNCTION (this);
return ConvertTo ();
}
--- a/src/network/utils/inet6-socket-address.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/network/utils/inet6-socket-address.cc Fri Dec 14 14:07:33 2012 -0800
@@ -94,7 +94,6 @@
Inet6SocketAddress::operator Address (void) const
{
- NS_LOG_FUNCTION (this);
return ConvertTo ();
}
--- a/src/network/utils/ipv4-address.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/network/utils/ipv4-address.cc Fri Dec 14 14:07:33 2012 -0800
@@ -319,7 +319,6 @@
}
Ipv4Address::operator Address () const
{
- NS_LOG_FUNCTION (this);
return ConvertTo ();
}
@@ -381,7 +380,6 @@
size_t Ipv4AddressHash::operator() (Ipv4Address const &x) const
{
- NS_LOG_FUNCTION (this << &x);
return x.Get ();
}
--- a/src/network/utils/ipv6-address.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/network/utils/ipv6-address.cc Fri Dec 14 14:07:33 2012 -0800
@@ -841,7 +841,6 @@
size_t Ipv6AddressHash::operator () (Ipv6Address const &x) const
{
- NS_LOG_FUNCTION (this << x);
uint8_t buf[16];
x.GetBytes (buf);
--- a/src/network/utils/mac48-address.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/network/utils/mac48-address.cc Fri Dec 14 14:07:33 2012 -0800
@@ -109,7 +109,6 @@
}
Mac48Address::operator Address () const
{
- NS_LOG_FUNCTION (this);
return ConvertTo ();
}
Address
--- a/src/network/utils/mac64-address.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/network/utils/mac64-address.cc Fri Dec 14 14:07:33 2012 -0800
@@ -107,7 +107,6 @@
}
Mac64Address::operator Address () const
{
- NS_LOG_FUNCTION (this);
return ConvertTo ();
}
Mac64Address
@@ -162,7 +161,6 @@
}
bool operator != (const Mac64Address &a, const Mac64Address &b)
{
- NS_LOG_FUNCTION (a << b);
return !(a == b);
}
--- a/src/network/utils/packet-socket-address.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/network/utils/packet-socket-address.cc Fri Dec 14 14:07:33 2012 -0800
@@ -83,7 +83,6 @@
PacketSocketAddress::operator Address () const
{
- NS_LOG_FUNCTION (this);
return ConvertTo ();
}
--- a/src/network/utils/packetbb.cc Thu Dec 13 17:02:39 2012 -0800
+++ b/src/network/utils/packetbb.cc Fri Dec 14 14:07:33 2012 -0800
@@ -275,7 +275,6 @@
bool
PbbTlvBlock::operator== (const PbbTlvBlock &other) const
{
- NS_LOG_FUNCTION (this << &other);
if (Size () != other.Size ())
{
return false;
@@ -297,7 +296,6 @@
bool
PbbTlvBlock::operator!= (const PbbTlvBlock &other) const
{
- NS_LOG_FUNCTION (this << &other);
return !(*this == other);
}
@@ -518,7 +516,6 @@
bool
PbbAddressTlvBlock::operator== (const PbbAddressTlvBlock &other) const
{
- NS_LOG_FUNCTION (this << &other);
if (Size () != other.Size ())
{
return false;
@@ -540,7 +537,6 @@
bool
PbbAddressTlvBlock::operator!= (const PbbAddressTlvBlock &other) const
{
- NS_LOG_FUNCTION (this << &other);
return !(*this == other);
}
@@ -978,7 +974,6 @@
bool
PbbPacket::operator== (const PbbPacket &other) const
{
- NS_LOG_FUNCTION (this << other);
if (GetVersion () != other.GetVersion ())
{
return false;
@@ -1021,7 +1016,6 @@
bool
PbbPacket::operator!= (const PbbPacket &other) const
{
- NS_LOG_FUNCTION (this << other);
return !(*this == other);
}
@@ -1635,7 +1629,6 @@
bool
PbbMessage::operator== (const PbbMessage &other) const
{
- NS_LOG_FUNCTION (this << &other);
if (GetAddressLength () != other.GetAddressLength ())
{
return false;
@@ -1724,7 +1717,6 @@
bool
PbbMessage::operator!= (const PbbMessage &other) const
{
- NS_LOG_FUNCTION (this << &other);
return !(*this == other);
}
@@ -2423,7 +2415,6 @@
bool
PbbAddressBlock::operator== (const PbbAddressBlock &other) const
{
- NS_LOG_FUNCTION (this << &other);
if (AddressSize () != other.AddressSize ())
{
return false;
@@ -2467,7 +2458,6 @@
bool
PbbAddressBlock::operator!= (const PbbAddressBlock &other) const
{
- NS_LOG_FUNCTION (this << &other);
return !(*this == other);
}
@@ -2987,7 +2977,6 @@
bool
PbbTlv::operator== (const PbbTlv &other) const
{
- NS_LOG_FUNCTION (this << &other);
if (GetType () != other.GetType ())
{
return false;
@@ -3033,7 +3022,6 @@
bool
PbbTlv::operator!= (const PbbTlv &other) const
{
- NS_LOG_FUNCTION (this << &other);
return !(*this == other);
}