From 5bba1a7084f87511df5907d9e858df7fb41b78fe Mon Sep 17 00:00:00 2001 From: Jason Hancock Date: Thu, 15 Mar 2007 02:03:43 +0000 Subject: [PATCH] sort of better --- panda/src/nativenet/Sources.pp | 2 +- panda/src/nativenet/buffered_datagramconnection.h | 4 ++-- panda/src/nativenet/buffered_datagramreader.h | 2 +- panda/src/nativenet/nativenet_composite1.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/panda/src/nativenet/Sources.pp b/panda/src/nativenet/Sources.pp index 9d3076210f..f9d75375d2 100644 --- a/panda/src/nativenet/Sources.pp +++ b/panda/src/nativenet/Sources.pp @@ -26,8 +26,8 @@ socket_udp_outgoing.h time_general.h #define INCLUDED_SOURCES \ - buffered_datagramconnection.cxx \ config_nativenet.cxx \ + buffered_datagramconnection.cxx \ socket_ip.cxx \ socket_tcp.cxx \ socket_tcp_listen.cxx \ diff --git a/panda/src/nativenet/buffered_datagramconnection.h b/panda/src/nativenet/buffered_datagramconnection.h index a074c5a164..7fc181578a 100755 --- a/panda/src/nativenet/buffered_datagramconnection.h +++ b/panda/src/nativenet/buffered_datagramconnection.h @@ -241,7 +241,7 @@ inline bool Buffered_DatagramConnection::SendMessageBufferOnly(Datagram &msg) if(val >= 0) return true; - nativenet_cat.error() << "Buffered_DatagramConnection::SendMessageBufferOnly->Error On Write--Out Buffer = " _Writer.AmountBuffered() << "\n"; + nativenet_cat.error() << "Buffered_DatagramConnection::SendMessageBufferOnly->Error On Write--Out Buffer = " << _Writer.AmountBuffered() << "\n"; ClearAll(); return false; } @@ -322,7 +322,7 @@ bool Buffered_DatagramConnection::Flush(void) inline void Buffered_DatagramConnection::Reset() { nativenet_cat.error() << "Buffered_DatagramConnection::Reset()\n"; - ClearAll();` + ClearAll(); }; diff --git a/panda/src/nativenet/buffered_datagramreader.h b/panda/src/nativenet/buffered_datagramreader.h index d882883596..bd8b3656fe 100755 --- a/panda/src/nativenet/buffered_datagramreader.h +++ b/panda/src/nativenet/buffered_datagramreader.h @@ -82,7 +82,7 @@ public: else { answer = -2; - nativenet_cat.error() << "buffered_datagram_reader:ReadPump Yeep! buffer has no room to read to -- " << sck.GetPeerName().get_ip_port().c_str() << "\nBufferAvaiable = " << readsize " AmountBuffered = " << AmountBuffered() << " BufferSize " << GetBufferSize() << "\n"; + nativenet_cat.error() << "buffered_datagram_reader:ReadPump Yeep! buffer has no room to read to -- " << sck.GetPeerName().get_ip_port().c_str() << "\nBufferAvaiable = " << readsize <<" AmountBuffered = " << AmountBuffered() << " BufferSize " << GetBufferSize() << "\n"; } return answer; diff --git a/panda/src/nativenet/nativenet_composite1.cxx b/panda/src/nativenet/nativenet_composite1.cxx index 2c20529336..51ddce8a5f 100755 --- a/panda/src/nativenet/nativenet_composite1.cxx +++ b/panda/src/nativenet/nativenet_composite1.cxx @@ -1,5 +1,5 @@ -#include "buffered_datagramconnection.cxx" #include "config_nativenet.cxx" +#include "buffered_datagramconnection.cxx" #include "socket_ip.cxx" #include "socket_tcp.cxx" #include "socket_tcp_listen.cxx"