Merge remote-tracking branch 'origin/master' into ticket37

[stg.git] / include / stg / message.h

diff --git a/include/stg/message.h b/include/stg/message.h
index 16fe566f662ef8b833c2df13d5a54132f29fc5e8..5a0e918ee37f99385cdb811755ef4f1968a1423c 100644 (file)
--- a/include/stg/message.h
+++ b/include/stg/message.h
@@ -27,7 +27,7 @@ STG_MSG_HDR()
       showTime(0),
       repeat(0),
       repeatPeriod(0)
       showTime(0),
       repeat(0),
       repeatPeriod(0)

-{};
+{}

 
 uint64_t    id;
 unsigned    ver;
 
 uint64_t    id;
 unsigned    ver;


@@ -41,12 +41,12 @@ unsigned    repeatPeriod;
 //-----------------------------------------------------------------------------
 struct STG_MSG
 {
 //-----------------------------------------------------------------------------
 struct STG_MSG
 {

-STG_MSG() {};
+STG_MSG() : header(), text() {}

 
 time_t GetNextSendTime() const
 {
 return header.lastSendTime + header.repeat * 60;
 
 time_t GetNextSendTime() const
 {
 return header.lastSendTime + header.repeat * 60;

-};
+}

 
 STG_MSG_HDR header;
 std::string text;
 
 STG_MSG_HDR header;
 std::string text;