Commit bfcf17e4 authored by Pavel Vainerman's avatar Pavel Vainerman

cleanup

parent b324364c
......@@ -87,7 +87,7 @@ namespace UniSetTypes
inline bool operator < ( const VoidMessage& msg ) const
{
if( priority != msg.priority )
return priority < msg.priority;
return priority < msg.priority;
if( tm.tv_sec != msg.tm.tv_sec )
return tm.tv_sec >= msg.tm.tv_sec;
......
......@@ -110,9 +110,14 @@ namespace UniSetTypes
/*! */
struct MessageInfo
{
UniSetTypes::MessageCode code; /*!< */
std::string text; /*!< */
std::string idname; /*!< */
UniSetTypes::MessageCode code; /*!< */
std::string text; /*!< */
std::string idname; /*!< */
inline bool operator < ( const MessageInfo& m ) const
{
return (code < m.code);
}
};
/*! */
......@@ -122,10 +127,15 @@ namespace UniSetTypes
id(DefaultObjectId),
repName(0),textName(0),data(0){}
ObjectId id; /*!< */
char* repName; /*!< */
char* textName; /*!< */
void* data;
ObjectId id; /*!< */
char* repName; /*!< */
char* textName; /*!< */
void* data;
inline bool operator < ( const ObjectInfo& o ) const
{
return (id < o.id);
}
};
typedef std::list<NodeInfo> ListOfNode;
......
......@@ -284,12 +284,5 @@ const ObjectInfo* ObjectIndex_XML::getObjectInfo( const ObjectId id )
return &omap[id];
return NULL;
/*
ObjectInfo ret;
ret.id = DefaultObjectId;
ret.repName = "";
ret.textName = "";
return ret;
*/
}
// ------------------------------------------------------------------------------------------
......@@ -228,12 +228,5 @@ const ObjectInfo* ObjectIndex_idXML::getObjectInfo( const ObjectId id )
return &(it->second);
return NULL;
/*
ObjectInfo ret;
ret.id = DefaultObjectId;
ret.repName = "";
ret.textName = "";
return ret;
*/
}
// ------------------------------------------------------------------------------------------
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment