Revision: 41756
http://brlcad.svn.sourceforge.net/brlcad/?rev=41756&view=rev
Author: davidloman
Date: 2010-12-22 13:17:13 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
Add squigglies to prevent cross initialization in the switch block.
Modified Paths:
--------------
rt^3/trunk/src/GS/GSClient.cxx
rt^3/trunk/src/GS/GeometryService.cxx
Modified: rt^3/trunk/src/GS/GSClient.cxx
===================================================================
--- rt^3/trunk/src/GS/GSClient.cxx 2010-12-22 13:04:58 UTC (rev 41755)
+++ rt^3/trunk/src/GS/GSClient.cxx 2010-12-22 13:17:13 UTC (rev 41756)
@@ -22,6 +22,8 @@
*
*/
+#include <sys/time.h>
+
#include "GSClient.h"
#include "NetMsgRouter.h"
@@ -100,18 +102,19 @@
return true;
}
case PING:
- Portal* p = msg->getOrigin();
+ {
+ Portal* p = msg->getOrigin();
- if (p != NULL) {
- QString remNodeName = p->getRemoteNodeName();
- log->logINFO("GeometryService", "PING from: '" +
remNodeName + "'");
- PongMsg pongMsg((PingMsg*)msg);
- p->send(&pongMsg);
- } else {
- log->logINFO("GeometryService", "Can't return ping.
NULL Portal*");
+ if (p != NULL) {
+ QString remNodeName = p->getRemoteNodeName();
+ log->logINFO("GeometryService", "PING from: '"
+ remNodeName + "'");
+ PongMsg pongMsg((PingMsg*)msg);
+ p->send(&pongMsg);
+ } else {
+ log->logINFO("GeometryService", "Can't return
ping. NULL Portal*");
+ }
}
- return true;
}
return false;
}
Modified: rt^3/trunk/src/GS/GeometryService.cxx
===================================================================
--- rt^3/trunk/src/GS/GeometryService.cxx 2010-12-22 13:04:58 UTC (rev
41755)
+++ rt^3/trunk/src/GS/GeometryService.cxx 2010-12-22 13:17:13 UTC (rev
41756)
@@ -121,18 +121,20 @@
return true;
}
case PING:
- Portal* p = msg->getOrigin();
+ {
+ Portal* p = msg->getOrigin();
- if (p != NULL) {
- QString remNodeName = p->getRemoteNodeName();
- log->logINFO("GeometryService", "PING from: '" +
remNodeName + "'");
- PongMsg pongMsg((PingMsg*)msg);
- p->send(&pongMsg);
- } else {
- log->logINFO("GeometryService", "Can't return ping.
NULL Portal*");
+ if (p != NULL) {
+ QString remNodeName = p->getRemoteNodeName();
+ log->logINFO("GeometryService", "PING from: '"
+ remNodeName + "'");
+ PongMsg pongMsg((PingMsg*)msg);
+ p->send(&pongMsg);
+ } else {
+ log->logINFO("GeometryService", "Can't return
ping. NULL Portal*");
+ }
+
+ return true;
}
-
- return true;
}
return false;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Forrester recently released a report on the Return on Investment (ROI) of
Google Apps. They found a 300% ROI, 38%-56% cost savings, and break-even
within 7 months. Over 3 million businesses have gone Google with Google Apps:
an online email calendar, and document program that's accessible from your
browser. Read the Forrester report: http://p.sf.net/sfu/googleapps-sfnew
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
