Fix compiler warnings.

This commit is contained in:
Jonathan Naylor
2017-04-28 17:01:53 +01:00
parent 6e9156497d
commit 80ef1757c0
3 changed files with 14 additions and 14 deletions

View File

@@ -31,7 +31,7 @@ const unsigned int BUFFER_LENGTH = 500U;
const unsigned int HOMEBREW_DATA_PACKET_LENGTH = 55U; const unsigned int HOMEBREW_DATA_PACKET_LENGTH = 55U;
CDMRNetwork::CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, const std::string& password, char* name, bool debug) : CDMRNetwork::CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, const std::string& password, const char* name, bool debug) :
m_address(), m_address(),
m_port(port), m_port(port),
m_id(NULL), m_id(NULL),

View File

@@ -30,7 +30,7 @@
class CDMRNetwork class CDMRNetwork
{ {
public: public:
CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, const std::string& password, char* name, bool debug); CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, const std::string& password, const char* name, bool debug);
~CDMRNetwork(); ~CDMRNetwork();
void setOptions(const std::string& options); void setOptions(const std::string& options);
@@ -54,7 +54,7 @@ private:
unsigned int m_port; unsigned int m_port;
uint8_t* m_id; uint8_t* m_id;
std::string m_password; std::string m_password;
char* m_name; const char* m_name;
bool m_debug; bool m_debug;
CUDPSocket m_socket; CUDPSocket m_socket;

View File

@@ -50,18 +50,18 @@ public:
void close(); void close();
private: private:
in_addr m_rptAddress; in_addr m_rptAddress;
unsigned int m_rptPort; unsigned int m_rptPort;
unsigned int m_id; unsigned int m_id;
unsigned char* m_netId; unsigned char* m_netId;
bool m_debug; bool m_debug;
CUDPSocket m_socket; CUDPSocket m_socket;
unsigned char* m_buffer; unsigned char* m_buffer;
std::string m_options;
unsigned char* m_configData;
unsigned int m_configLen;
CRingBuffer<unsigned char> m_rxData; CRingBuffer<unsigned char> m_rxData;
std::string m_options;
unsigned char* m_configData;
unsigned int m_configLen;
}; };
#endif #endif