Revision: 9103
http://playerstage.svn.sourceforge.net/playerstage/?rev=9103&view=rev
Author: jpgr87
Date: 2012-09-09 18:34:52 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
Applied patch #3566064: replace non-portable uint with uint32_t (again!)
Modified Paths:
--------------
code/player/trunk/client_libs/libplayerc++/blackboardproxy.cc
code/player/trunk/client_libs/libplayerc++/coopobjectproxy.cc
code/player/trunk/client_libs/libplayerc++/playerc++.h
code/player/trunk/server/drivers/wsn/generic_xbow.cc
code/player/trunk/server/drivers/wsn/generic_xbow_structdef.cc
Modified: code/player/trunk/client_libs/libplayerc++/blackboardproxy.cc
===================================================================
--- code/player/trunk/client_libs/libplayerc++/blackboardproxy.cc
2012-09-08 00:54:35 UTC (rev 9102)
+++ code/player/trunk/client_libs/libplayerc++/blackboardproxy.cc
2012-09-09 18:34:52 UTC (rev 9103)
@@ -71,12 +71,12 @@
mDevice = playerc_blackboard_create(mClient, aIndex);
if (NULL==mDevice)
{
- throw PlayerError("BlackBoardProxy::Subscribe(uint aIndex)", "could not
create");
+ throw PlayerError("BlackBoardProxy::Subscribe(uint32_t aIndex)", "could
not create");
}
if (0 != playerc_blackboard_subscribe(mDevice, PLAYER_OPEN_MODE))
{
- throw PlayerError("BlackBoardProxy::Subscribe(uint aIndex)", "could not
subscribe");
+ throw PlayerError("BlackBoardProxy::Subscribe(uint32_t aIndex)", "could
not subscribe");
}
mDevice->on_blackboard_event = NULL;
Modified: code/player/trunk/client_libs/libplayerc++/coopobjectproxy.cc
===================================================================
--- code/player/trunk/client_libs/libplayerc++/coopobjectproxy.cc
2012-09-08 00:54:35 UTC (rev 9102)
+++ code/player/trunk/client_libs/libplayerc++/coopobjectproxy.cc
2012-09-09 18:34:52 UTC (rev 9103)
@@ -173,7 +173,7 @@
break;
}
os << " - Position (x,y,z): (" << c.GetX() << "," <<
c.GetY() << "," << c.GetZ() << ")" << std::endl;
- os << " - State: 0x" << hex <<(uint)c.GetStatus() <<
std::endl;
+ os << " - State: 0x" << hex
<<static_cast<uint32_t>(c.GetStatus()) << std::endl;
os.setf(ios::dec, ios::basefield);
break;
}
@@ -199,11 +199,11 @@
os << " - Origin: Unknown"<< std::endl;
break;
}
- uint sensorNumber = c.GetSensorNumber();
+ uint32_t sensorNumber = c.GetSensorNumber();
if (sensorNumber > 0) {
os << " - Node SENSOR data:" << std::endl;
- for (uint i = 0; i < sensorNumber; i++){
- os << "\t· sensor[" << i << "]
of type " << (uint)c.GetSensorType(i) << ": " << c.GetSensorData(i) <<
std::endl;
+ for (uint32_t i = 0; i < sensorNumber; i++){
+ os << "\t· sensor[" << i << "]
of type " << static_cast<uint32_t>(c.GetSensorType(i)) << ": " <<
c.GetSensorData(i) << std::endl;
}
} else os << "No sensor data available." << std::endl;
break;
@@ -230,11 +230,11 @@
os << " - Origin: Unknown"<< std::endl;
break;
}
- uint alarmNumber = c.GetAlarmNumber();
+ uint32_t alarmNumber = c.GetAlarmNumber();
if (alarmNumber >0) {
os << " - Node ALARM data:" << std::endl;
- for (uint i = 0; i < alarmNumber; i++){
- os << "\t· alarm[" << i << "]
of type " << (uint)c.GetAlarmType(i) << ": " << c.GetAlarmData(i) << std::endl;
+ for (uint32_t i = 0; i < alarmNumber; i++){
+ os << "\t· alarm[" << i << "]
of type " << static_cast<uint32_t>(c.GetAlarmType(i)) << ": " <<
c.GetAlarmData(i) << std::endl;
}
} else os << "No alarm data available." << std::endl;
break;
@@ -268,7 +268,7 @@
if (parameters != NULL && parametersSize > 0) {
os << "\t· Parameters: [";
for (int i = 0; i < parametersSize; i++)
- os << " 0x" << hex <<
(uint)parameters[i];
+ os << " 0x" << hex <<
static_cast<uint32_t>(parameters[i]);
os << " ]" << std::endl;
os.setf(ios::dec, ios::basefield);
}
@@ -303,7 +303,7 @@
if (parameters != NULL && parametersSize > 0) {
os << "\t· Parameters: [";
for (int i = 0; i < parametersSize; i++)
- os << " 0x" << hex <<
(uint)parameters[i];
+ os << " 0x" << hex <<
static_cast<uint32_t>(parameters[i]);
os << " ]" << std::endl;
os.setf(ios::dec, ios::basefield);
}
@@ -331,14 +331,14 @@
os << " - Origin: Unknown"<< std::endl;
break;
}
- uint userDataNumber = c.GetUserDataNumber();
+ uint32_t userDataNumber = c.GetUserDataNumber();
uint8_t *userData = c.GetAllUserData();
if (userData != NULL && userDataNumber > 0) {
os << " - USER data:" << std::endl;
os << "\t· Type: " << c.MessageType() <<
std::endl;
os << "\t· Data: [";
- for (uint i = 0; i < userDataNumber; i++)
- os << " 0x" << hex << (uint)userData[i];
+ for (uint32_t i = 0; i < userDataNumber; i++)
+ os << " 0x" << hex <<
static_cast<uint32_t>(userData[i]);
os << " ]" << std::endl;
os.setf(ios::dec, ios::basefield);
} else os << "No user data available." << std::endl;
@@ -356,7 +356,7 @@
}
void
-CoopObjectProxy::SendData(int nodeID, int sourceID, int extradata_type, uint
extradata_size, unsigned char *extradata)
+CoopObjectProxy::SendData(int nodeID, int sourceID, int extradata_type,
uint32_t extradata_size, unsigned char *extradata)
{
// scoped_lock_t lock(mPc->mMutex);
playerc_coopobject_send_data(mDevice, nodeID, GetProxyID(), extradata_type,
extradata_size, extradata);
@@ -364,14 +364,14 @@
}
void
-CoopObjectProxy::SendCommand(int nodeID, int sourceID, int command, uint
cmd_parameters_size, unsigned char *cmd_parameters)
+CoopObjectProxy::SendCommand(int nodeID, int sourceID, int command, uint32_t
cmd_parameters_size, unsigned char *cmd_parameters)
{
// scoped_lock_t lock(mPc->mMutex);
playerc_coopobject_send_cmd(mDevice, nodeID, GetProxyID(), command,
cmd_parameters_size, cmd_parameters);
}
void
-CoopObjectProxy::SendRequest(int nodeID, int sourceID, int request, uint
req_parameters_size, unsigned char *req_parameters)
+CoopObjectProxy::SendRequest(int nodeID, int sourceID, int request, uint32_t
req_parameters_size, unsigned char *req_parameters)
{
// scoped_lock_t lock(mPc->mMutex);
playerc_coopobject_send_req(mDevice, nodeID, GetProxyID(), request,
req_parameters_size, req_parameters);
Modified: code/player/trunk/client_libs/libplayerc++/playerc++.h
===================================================================
--- code/player/trunk/client_libs/libplayerc++/playerc++.h 2012-09-08
00:54:35 UTC (rev 9102)
+++ code/player/trunk/client_libs/libplayerc++/playerc++.h 2012-09-09
18:34:52 UTC (rev 9103)
@@ -633,22 +633,22 @@
/// - @ref PLAYER_COOPOBJECT_ORIGIN_MOBILEBASE
/// - @ref PLAYER_COOPOBJECT_ORIGIN_MOTE
/// - @ref PLAYER_COOPOBJECT_ORIGIN_ROBOT
- uint GetOrigin () const { return GetVar(mDevice->origin); };
+ uint32_t GetOrigin () const { return GetVar(mDevice->origin); };
/// @brief Cooperating Object ID
- uint GetID () const { return GetVar(mDevice->id); };
+ uint32_t GetID () const { return GetVar(mDevice->id); };
/// @brief Cooperating Object Parent ID
- uint GetParentID () const { return GetVar(mDevice->parent_id); };
+ uint32_t GetParentID() const { return GetVar(mDevice->parent_id); };
/// @brief Get robot ID
- uint GetProxyID () const { return id; };
+ uint32_t GetProxyID () const { return id; };
/// @brief Set robot ID
- void SetProxyID (uint value) { id = value; };
+ void SetProxyID (uint32_t value) { id = value; };
/// @brief Get number of sensors included in the message
- uint GetSensorNumber () const { return
GetVar(mDevice->sensor_data_count); };
+ uint32_t GetSensorNumber () const { return
GetVar(mDevice->sensor_data_count); };
// int *GetAllSensorData () const { return GetVar(mDevice->sensor_data);
};
@@ -669,13 +669,13 @@
/// - @ref PLAYER_COOPOBJECT_CO
/// - @ref PLAYER_COOPOBJECT_CO2
/// - @ref PLAYER_COOPOBJECT_H2
- uint8_t GetSensorType (uint index) const { if ( index <
GetSensorNumber() ) return GetVar(mDevice->sensor_data[index].type); else
return -1; };
+ uint8_t GetSensorType (uint32_t index) const { if ( index <
GetSensorNumber() ) return GetVar(mDevice->sensor_data[index].type); else
return -1; };
/// @brief Sensor value
- uint16_t GetSensorData (uint index) const { if ( index <
GetSensorNumber() ) return GetVar(mDevice->sensor_data[index].value); else
return -1; };
+ uint16_t GetSensorData (uint32_t index) const { if ( index <
GetSensorNumber() ) return GetVar(mDevice->sensor_data[index].value); else
return -1; };
/// @brief Get number of alarms included in the message
- uint GetAlarmNumber () const { return
GetVar(mDevice->alarm_data_count); };
+ uint32_t GetAlarmNumber () const { return
GetVar(mDevice->alarm_data_count); };
// int *GetAllAlarmData () const { return GetVar(mDevice->alarm_data);
};
@@ -698,19 +698,19 @@
/// - @ref PLAYER_COOPOBJECT_H2
/// - @ref PLAYER_COOPOBJECT_SMOKE
/// - @ref PLAYER_COOPOBJECT_OPTSWITCH
- uint8_t GetAlarmType (uint index) const { if ( index <
GetAlarmNumber() ) return GetVar(mDevice->alarm_data[index].type); else return
-1; };
+ uint8_t GetAlarmType (uint32_t index) const { if ( index <
GetAlarmNumber() ) return GetVar(mDevice->alarm_data[index].type); else return
-1; };
/// @brief Alarm value
- uint16_t GetAlarmData (uint index) const { if ( index <
GetAlarmNumber() ) return GetVar(mDevice->alarm_data[index].value); else return
-1; };
+ uint16_t GetAlarmData (uint32_t index) const { if ( index <
GetAlarmNumber() ) return GetVar(mDevice->alarm_data[index].value); else return
-1; };
/// @brief Get number of bytes of user defined data
- uint GetUserDataNumber () const { return
GetVar(mDevice->user_data_count); };
+ uint32_t GetUserDataNumber () const { return
GetVar(mDevice->user_data_count); };
/// @brief User defined data array
uint8_t *GetAllUserData () const { return GetVar(mDevice->user_data);
};
/// @brief Indexed user defined byte
- uint8_t GetUserData (uint index) const { if ( index <
GetUserDataNumber() ) return GetVar(mDevice->user_data[index]); else return
0xFF; };
+ uint8_t GetUserData (uint32_t index) const { if ( index <
GetUserDataNumber() ) return GetVar(mDevice->user_data[index]); else return
0xFF; };
/// @brief Radio Signal Strength sender ID
uint16_t GetRSSIsenderId () const { return GetVar(mDevice->RSSIsender);
};
@@ -731,24 +731,24 @@
uint8_t GetStatus () const { return GetVar(mDevice->status); };
/// @brief Request type
- uint GetRequest () const { return GetVar(mDevice->request); };
+ uint32_t GetRequest () const { return GetVar(mDevice->request);
};
/// @brief Command type
- uint GetCommand () const { return GetVar(mDevice->command); };
+ uint32_t GetCommand () const { return GetVar(mDevice->command);
};
/// @brief Request/Command parameter array size (in bytes)
- uint GetParametersSize () const { return
GetVar(mDevice->parameters_count); };
+ uint32_t GetParametersSize () const { return
GetVar(mDevice->parameters_count); };
/// @brief Request/Command parameter array
uint8_t *GetAllParameters () const { return GetVar(mDevice->parameters);
};
/// @brief Indexed user defined byte
- uint8_t GetParameter (uint index) const { if ( index <
GetParametersSize() ) return GetVar(mDevice->parameters[index]); else return
0xFF; };
+ uint8_t GetParameter (uint32_t index) const { if ( index <
GetParametersSize() ) return GetVar(mDevice->parameters[index]); else return
0xFF; };
/// @brief Send user data to Cooperating Object
void SendData(int destID, int sourceID, player_pose2d_t pos, int status);
/// @brief Send user data to Cooperating Object
- void SendData(int destID, int sourceID, int extradata_type, uint
extradata_size, uint8_t *extradata);
+ void SendData(int destID, int sourceID, int extradata_type, uint32_t
extradata_size, uint8_t *extradata);
/// @brief Send command to Cooperating Object
- void SendCommand(int destID, int sourceID, int command, uint
cmd_parameters_size = 0, uint8_t *cmd_parameters = NULL);
+ void SendCommand(int destID, int sourceID, int command, uint32_t
cmd_parameters_size = 0, uint8_t *cmd_parameters = NULL);
/// @brief Send request to Cooperating Object
- void SendRequest(int destID, int sourceID, int request, uint
req_parameters_size = 0, uint8_t *req_parameters = NULL);
+ void SendRequest(int destID, int sourceID, int request, uint32_t
req_parameters_size = 0, uint8_t *req_parameters = NULL);
};
Modified: code/player/trunk/server/drivers/wsn/generic_xbow.cc
===================================================================
--- code/player/trunk/server/drivers/wsn/generic_xbow.cc 2012-09-08
00:54:35 UTC (rev 9102)
+++ code/player/trunk/server/drivers/wsn/generic_xbow.cc 2012-09-09
18:34:52 UTC (rev 9103)
@@ -576,7 +576,7 @@
wsn_data.data_count = (uint32_t)(*(uint8_t *)(transparent_msg+indx));
indx += sizeof(uint8_t);
wsn_data.data = new player_coopobject_sensor_t[wsn_data.data_count];
- for(uint i = 0; i < wsn_data.data_count; i++) {
+ for(uint32_t i = 0; i < wsn_data.data_count; i++) {
wsn_data.data[i].type = *(uint8_t *)(transparent_msg+indx);
indx += sizeof(uint8_t);
wsn_data.data[i].value = *(int16_t *)(transparent_msg+indx);
@@ -585,7 +585,7 @@
PLAYER_MSG1 (1,"> Received Sensor data from CoopObj %d",
wsn_data.header.id);
#ifdef debug
- for(uint i = 0; i < wsn_data.data_count; i++)
+ for(uint32_t i = 0; i < wsn_data.data_count; i++)
PLAYER_MSG2 (0," [%d]
%d",wsn_data.data[i].type, wsn_data.data[i].value);
#endif
// Publish message
@@ -604,7 +604,7 @@
wsn_data.data_count = (uint32_t)(*(uint8_t *)(transparent_msg+indx));
indx += sizeof(uint8_t);
wsn_data.data = new player_coopobject_sensor_t[wsn_data.data_count];
- for(uint i = 0; i < wsn_data.data_count; i++) {
+ for(uint32_t i = 0; i < wsn_data.data_count; i++) {
wsn_data.data[i].type = *(uint8_t *)(transparent_msg+indx);
indx += sizeof(uint8_t);
wsn_data.data[i].value = *(int16_t *)(transparent_msg+indx);
@@ -613,7 +613,7 @@
PLAYER_MSG1 (1,"> Received Alarm data from CoopObj %d",
wsn_data.header.id);
#ifdef debug
- for(uint i = 0; i < wsn_data.data_count; i++)
+ for(uint32_t i = 0; i < wsn_data.data_count; i++)
PLAYER_MSG2 (0," [%d]
%d",wsn_data.data[i].type, wsn_data.data[i].value);
#endif
// Publish message
@@ -634,14 +634,14 @@
wsn_data.parameters_count = (uint32_t)(*(uint8_t
*)(transparent_msg+indx));
indx += sizeof(uint8_t);
wsn_data.parameters = new uint8_t[wsn_data.parameters_count];
- for(uint i = 0; i < wsn_data.parameters_count; i++) {
+ for(uint32_t i = 0; i < wsn_data.parameters_count; i++) {
wsn_data.parameters[i] = *(uint8_t *)(transparent_msg+indx);
indx += sizeof(uint8_t);
}
PLAYER_MSG2 (1,"> Received Request %d from CoopObj %d",
wsn_data.request, wsn_data.header.id);
#ifdef debug
- for(uint i = 0; i < wsn_data.parameters_count; i++)
+ for(uint32_t i = 0; i < wsn_data.parameters_count; i++)
PLAYER_MSG2 (0," [%d]
0x%02x",i, wsn_data.parameters[i]);
#endif
// Publish message
@@ -662,14 +662,14 @@
wsn_data.parameters_count = (uint32_t)(*(uint8_t
*)(transparent_msg+indx));
indx += sizeof(uint8_t);
wsn_data.parameters = new uint8_t[wsn_data.parameters_count];
- for(uint i = 0; i < wsn_data.parameters_count; i++) {
+ for(uint32_t i = 0; i < wsn_data.parameters_count; i++) {
wsn_data.parameters[i] = *(uint8_t *)(transparent_msg+indx);
indx += sizeof(uint8_t);
}
PLAYER_MSG2 (1,"> Received Command %d from CoopObj %d",
wsn_data.command, wsn_data.header.id);
#ifdef debug
- for(uint i = 0; i < wsn_data.parameters_count; i++)
+ for(uint32_t i = 0; i < wsn_data.parameters_count; i++)
PLAYER_MSG2 (0," [%d]
0x%02x",i, wsn_data.parameters[i]);
#endif
// Publish message
@@ -688,14 +688,14 @@
wsn_data.data_count = (uint32_t)(*(uint8_t *)(transparent_msg+indx));
indx += sizeof(uint8_t);
wsn_data.data = new uint8_t[wsn_data.data_count];
- for(uint i = 0; i < wsn_data.data_count; i++) {
+ for(uint32_t i = 0; i < wsn_data.data_count; i++) {
wsn_data.data[i] = *(uint8_t *)(transparent_msg+indx);
indx += sizeof(uint8_t);
}
PLAYER_MSG1 (1,"> Received User defined data from CoopObj %d",
wsn_data.header.id);
#ifdef debug
- for(uint i = 0; i < wsn_data.data_count; i++)
+ for(uint32_t i = 0; i < wsn_data.data_count; i++)
PLAYER_MSG2 (0," [%d]
0x%02x",i, wsn_data.data[i]);
#endif
// Publish message
@@ -836,13 +836,13 @@
wsn_data.data_count = wsn_msg.sensor_count;
wsn_data.data = new player_coopobject_sensor_t[wsn_data.data_count];
- for(uint i = 0; i < wsn_data.data_count; i++) {
+ for(uint32_t i = 0; i < wsn_data.data_count; i++) {
wsn_data.data[i].type = wsn_msg.sensor[i].type;
wsn_data.data[i].value = wsn_msg.sensor[i].value;
}
PLAYER_MSG2 (1,"> Received %d sensors data from CoopObj %d",
wsn_data.data_count, wsn_data.header.id);
#ifdef debug
- for(uint i = 0; i < wsn_data.data_count; i++)
+ for(uint32_t i = 0; i < wsn_data.data_count; i++)
PLAYER_MSG2 (0," [%d]
%d",wsn_data.data[i].type, wsn_data.data[i].value);
#endif
// Publish message
@@ -871,13 +871,13 @@
wsn_data.data_count = wsn_msg.sensor_count;
wsn_data.data = new player_coopobject_sensor_t[wsn_data.data_count];
- for(uint i = 0; i < wsn_data.data_count; i++) {
+ for(uint32_t i = 0; i < wsn_data.data_count; i++) {
wsn_data.data[i].type = wsn_msg.sensor[i].type;
wsn_data.data[i].value = wsn_msg.sensor[i].value;
}
PLAYER_MSG2 (1,"> Received %d alarm data from CoopObj %d",
wsn_data.data_count, wsn_data.header.id);
#ifdef debug
- for(uint i = 0; i < wsn_data.data_count; i++)
+ for(uint32_t i = 0; i < wsn_data.data_count; i++)
PLAYER_MSG2 (0," [%d]
%d",wsn_data.data[i].type, wsn_data.data[i].value);
#endif
// Publish message
@@ -907,12 +907,12 @@
wsn_data.parameters_count = wsn_msg.parameters_size;
wsn_data.parameters = new uint8_t[wsn_data.parameters_count];
- for(uint i = 0; i < wsn_data.parameters_count; i++)
+ for(uint32_t i = 0; i < wsn_data.parameters_count; i++)
wsn_data.parameters[i] = wsn_msg.parameters[i];
PLAYER_MSG2 (1,"> Received Request %d from CoopObj %d",
wsn_data.request, wsn_data.header.id);
#ifdef debug
- for(uint i = 0; i < wsn_data.parameters_count; i++)
+ for(uint32_t i = 0; i < wsn_data.parameters_count; i++)
PLAYER_MSG2 (0," [%d]
0x%02x",i, wsn_data.parameters[i]);
#endif
// Publish message
@@ -941,12 +941,12 @@
wsn_data.parameters_count = wsn_msg.parameters_size;
wsn_data.parameters = new uint8_t[wsn_data.parameters_count];
- for(uint i = 0; i < wsn_data.parameters_count; i++)
+ for(uint32_t i = 0; i < wsn_data.parameters_count; i++)
wsn_data.parameters[i] = wsn_msg.parameters[i];
PLAYER_MSG2 (1,"> Received Command %d from CoopObj %d",
wsn_data.command, wsn_data.header.id);
#ifdef debug
- for(uint i = 0; i < wsn_data.parameters_count; i++)
+ for(uint32_t i = 0; i < wsn_data.parameters_count; i++)
PLAYER_MSG2 (0," [%d]
0x%02x",i, wsn_data.parameters[i]);
#endif
// Publish data
@@ -976,11 +976,11 @@
wsn_data.data_count = wsn_msg.data_size;
wsn_data.data = new uint8_t[wsn_data.data_count];
- for(uint i = 0; i < wsn_data.data_count; i++)
+ for(uint32_t i = 0; i < wsn_data.data_count; i++)
wsn_data.data[i] = wsn_msg.data[i];
PLAYER_MSG2 (1,"> Received User data %d from CoopObj %d",
wsn_data.type, wsn_data.header.id);
#ifdef debug
- for(uint i = 0; i < wsn_data.data_count; i++)
+ for(uint32_t i = 0; i < wsn_data.data_count; i++)
PLAYER_MSG2 (0," [%d]
0x%02x",i, wsn_data.data[i]);
#endif
// Publish message
@@ -1129,7 +1129,7 @@
#endif
*(uint8_t **)(data+data_ind) = new uint8_t[array_size];
uint8_t *array = *(uint8_t **)(data+data_ind);
- for(uint j = 1; j <= array_nfields; j++) {
+ for(uint32_t j = 1; j <= array_nfields; j++) {
if(data_def[i+j]=='b') {
*((uint8_t *)array+array_ind) = *((uint8_t *)msg+msg_ind);
#ifdef debug
Modified: code/player/trunk/server/drivers/wsn/generic_xbow_structdef.cc
===================================================================
--- code/player/trunk/server/drivers/wsn/generic_xbow_structdef.cc
2012-09-08 00:54:35 UTC (rev 9102)
+++ code/player/trunk/server/drivers/wsn/generic_xbow_structdef.cc
2012-09-09 18:34:52 UTC (rev 9103)
@@ -55,15 +55,15 @@
};
template<> char *defineStruct<player_coopobject_data_sensor_t>(const
player_coopobject_data_sensor_t &obj){
- uint n_elements = 5;
- uint size = 2*obj.data_count;
+ uint32_t n_elements = 5;
+ uint32_t size = 2*obj.data_count;
char *result = new char[n_elements+size+1+1];
result[0] = 'b';
result[1] = 's';
result[2] = 's';
result[3] = 'c';
result[4] = 'p';
- uint i = n_elements;
+ uint32_t i = n_elements;
for (i = n_elements; i < size+n_elements; i+=2) {
result[i] = 'b';
result[i+1] = 's';
@@ -74,7 +74,7 @@
};
template<> char *defineStruct<player_coopobject_data_userdefined_t>(const
player_coopobject_data_userdefined_t &obj){
- uint n_elements = 6;
+ uint32_t n_elements = 6;
char *result = new char[n_elements+obj.data_count+1+1];
result[0] = 'b';
result[1] = 's';
@@ -82,7 +82,7 @@
result[3] = 'b';
result[4] = 'c';
result[5] = 'p';
- uint i = n_elements;
+ uint32_t i = n_elements;
for (i = n_elements; i < obj.data_count+n_elements; i++)
result[i] = 'b';
result[n_elements+obj.data_count] = 'r';
@@ -91,7 +91,7 @@
};
template<> char *defineStruct<player_coopobject_req_t>(const
player_coopobject_req_t &obj){
- uint n_elements = 6;
+ uint32_t n_elements = 6;
char *result = new char[n_elements+obj.parameters_count+1+1];
result[0] = 'b';
result[1] = 's';
@@ -99,7 +99,7 @@
result[3] = 'b';
result[4] = 'c';
result[5] = 'p';
- uint i = n_elements;
+ uint32_t i = n_elements;
for (i = n_elements; i < obj.parameters_count+n_elements; i++)
result[i] = 'b';
result[n_elements+obj.parameters_count] = 'r';
@@ -108,7 +108,7 @@
};
template<> char *defineStruct<player_coopobject_cmd_t>(const
player_coopobject_cmd_t &obj){
- uint n_elements = 6;
+ uint32_t n_elements = 6;
char *result = new char[n_elements+obj.parameters_count+1+1];
result[0] = 'b';
result[1] = 's';
@@ -116,7 +116,7 @@
result[3] = 'b';
result[4] = 'c';
result[5] = 'p';
- uint i = n_elements;
+ uint32_t i = n_elements;
for (i = n_elements; i < obj.parameters_count+n_elements; i++)
result[i] = 'b';
result[n_elements+obj.parameters_count] = 'r';
@@ -152,14 +152,14 @@
return def;
};
template<> char *defineStruct<SensorMsg>(const SensorMsg &obj){
- uint n_elements = 5;
+ uint32_t n_elements = 5;
char *result = new char[n_elements+2*obj.sensor_count+1+1];
result[0] = 'b';
result[1] = 's';
result[2] = 's';
result[3] = 'b';
result[4] = 'p';
- uint i = n_elements;
+ uint32_t i = n_elements;
while (i < 2*obj.sensor_count+n_elements) {
result[i++] = 'b';
result[i++] = 's';
@@ -170,14 +170,14 @@
};
template<> char *defineStruct<UserDataMsg>(const UserDataMsg &obj){
- uint n_elements = 5;
+ uint32_t n_elements = 5;
char *result = new char[n_elements+obj.data_size+1+1];
result[0] = 'b';
result[1] = 's';
result[2] = 's';
result[3] = 'b';
result[4] = 'p';
- uint i = n_elements;
+ uint32_t i = n_elements;
while (i < obj.data_size+n_elements) {
result[i++] = 'b';
}
@@ -187,7 +187,7 @@
};
template<> char *defineStruct<RequestMsg>(const RequestMsg &obj){
- uint n_elements = 6;
+ uint32_t n_elements = 6;
char *result = new char[n_elements+obj.parameters_size+1+1];
result[0] = 'b';
result[1] = 's';
@@ -195,7 +195,7 @@
result[3] = 'b';
result[4] = 'b';
result[5] = 'p';
- uint i = n_elements;
+ uint32_t i = n_elements;
while (i < obj.parameters_size+n_elements) {
result[i++] = 'b';
}
@@ -204,7 +204,7 @@
return result;
};
template<> char *defineStruct<CommandMsg>(const CommandMsg &obj){
- uint n_elements = 6;
+ uint32_t n_elements = 6;
char *result = new char[n_elements+obj.parameters_size+1+1];
result[0] = 'b';
result[1] = 's';
@@ -212,7 +212,7 @@
result[3] = 'b';
result[4] = 'b';
result[5] = 'p';
- uint i = n_elements;
+ uint32_t i = n_elements;
while (i < obj.parameters_size+n_elements) {
result[i++] = 'b';
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
