Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-06 08:05:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make rs-nogui+SSH compile against the trunk.

Browse source 
* converted to new flags format for File Operations.
 * converted from PUBLIC to VISIBLE lobbies. NB: This required name changes to protobuf definitions.
 * converted DataRates to new function.
 * directory sharing shifted to using OTHERS flags (text menus) - No support for group Flags yet.
 * Added == operator to Flags Type.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6000 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-12-17 01:24:16 +00:00
parent f764a82408
commit d3787cb324
12 changed files with 147 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/retroshare/rsflags.h
View file

@ -30,6 +30,7 @@ template<int n> class t_RsFlags32
inline t_RsFlags32<n> operator^ (const t_RsFlags32<n>& f) const { return t_RsFlags32<n>(_bits ^ f._bits) ; }
inline bool operator!=(const t_RsFlags32<n>& f) const { return _bits != f._bits ; }
inline bool operator==(const t_RsFlags32<n>& f) const { return _bits == f._bits ; }
inline bool operator& (const t_RsFlags32<n>& f) const { return (_bits & f._bits)>0 ; }
inline t_RsFlags32<n> operator|=(const t_RsFlags32<n>& f) { _bits |= f._bits ; return *this ;}

3
libretroshare/src/retroshare/rsmsgs.h
View file

@ -164,6 +164,7 @@ class ChatLobbyInvite
std::string lobby_topic ;
uint32_t lobby_privacy_level ;
};
class VisibleChatLobbyRecord
{
public:
@ -178,6 +179,8 @@ class VisibleChatLobbyRecord
time_t last_report_time ; // last time the lobby was reported.
uint32_t lobby_privacy_level ; // see RS_CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC / RS_CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE
};
class ChatLobbyInfo
{
public: