reconciling differences

Merge branch 'master' of https://github.com/USNavalResearchLaboratory/protolib
USNavalResearchLaboratory · May 9, 2024 · f530eba · f530eba
2 parents 23a3fd2 + 11e10c4
commit f530eba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/makefiles/Makefile.common b/makefiles/Makefile.common
@@ -392,8 +392,9 @@ stree:    $(STREE_OBJ) libprotokit.a
 
 clean:	
 	rm -f *.o $(COMMON)/*.o $(MANET)/*.o $(NS)/*.o ../src/*/*.o ../examples/*.o \
-        *.a *.$(SYSTEM_SOEXT) ../lib/*.a ../lib/*.../bin/* $(SYSTEM_SOEXT) \
-        arposer averageExample base64Example detourExample graphExample graphRider graphXMLExample jsonExample lfsrExample msg2MsgExample msgExample netExample pcmd pipe2SockExample pipeExample protoCapExample protoApp protoExample protoFileExample queueExample riposer serialExample simpleTcpExample sock2PipeExample threadExample timerTest ting vifExample vifLan gr ../bin/*
+        *.a *.$(SYSTEM_SOEXT) ../lib/*.a ../lib/* ../bin/* $(SYSTEM_SOEXT) \
+        arposer averageExample base64Example detourExample graphExample graphRider graphXMLExample jsonExample lfsrExample msg2MsgExample msgExample netExample pcmd pipe2SockExample pipeExample protoCapExample protoApp protoExample protoFileExample queueExample riposer serialExample simpleTcpExample sock2PipeExample threadExample timerTest ting vifExample vifLan gr
+	rm -rf ../build/* ../protokit.egg-info
 
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.

diff --git a/src/common/protoSocket.cpp b/src/common/protoSocket.cpp
@@ -1303,7 +1303,7 @@ bool ProtoSocket::Accept(ProtoSocket* newSocket)
 bool ProtoSocket::Send(const char*         buffer, 
                        unsigned int&       numBytes)
 {
-    TRACE("ProtoSocket::Send() ...\n");
+    //TRACE("ProtoSocket::Send() ...\n");
     if (IsConnected())
     {
 #ifdef WIN32