mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-25 15:39:27 -05:00
merged with upstream/master
This commit is contained in:
csoler
commit
ae37787853
@ -1,5 +1,26 @@
|
||||
retroshare06 (0.6.1-1.XXXXXX~YYYYYY) YYYYYY; urgency=low
|
||||
|
||||
cf8dac2 csoler Sat, 3 Dec 2016 21:00:16 +0100 fixed initialisation of random salt in directory updater when no config file is presen
|
||||
eedeaeb csoler Sat, 3 Dec 2016 15:13:04 +0100 used light grey instead of read to show missing directories
|
||||
8adb91b csoler Sat, 3 Dec 2016 15:04:57 +0100 removed compilation of ShareDialog that is unused, and cleanup the editing in ShareMan
|
||||
6890669 defnax Fri, 2 Dec 2016 23:00:57 +0100 update emotes file
|
||||
a005fa0 csoler Fri, 2 Dec 2016 19:36:34 +0100 display missing directories in red in share manager
|
||||
ff271c6 csoler Fri, 2 Dec 2016 19:02:41 +0100 force recheck of existing files at start, to possibly re-hash files that were not alre
|
||||
d986216 csoler Thu, 1 Dec 2016 23:27:15 +0100 remove non existing shared directories when not found on the disk
|
||||
d7ef33e csoler Wed, 30 Nov 2016 22:51:18 +0100 Merge pull request #544 from PhenomRetroShare/Fix_SomeWarnings
|
||||
674b6de Phenom Sat, 22 Oct 2016 23:48:19 +0200 Fix Some gcc warnings 383 to 208 lines
|
||||
74aa55e defnax Wed, 30 Nov 2016 08:12:46 +0100 Merge pull request #587 from dimqua/patch-1
|
||||
d616df3 defnax Wed, 30 Nov 2016 08:12:38 +0100 Merge pull request #586 from hunbernd/fix/external-emoticons
|
||||
90abd2f dimqua Tue, 29 Nov 2016 19:05:02 +0300 bdboot update
|
||||
5fd1de0 hunbernd Mon, 28 Nov 2016 00:35:09 +0100 Fixed loading of external emoticons - path comparison was Linux specific, also it h
|
||||
137d71c csoler Sun, 27 Nov 2016 20:57:38 +0100 extended the window during which the GUI is told to tell that the update of shared di
|
||||
6937d87 csoler Sun, 27 Nov 2016 12:21:14 +0100 changed from std::string to RsPgpId to represent openned items in FriendList
|
||||
f3d7948 csoler Sun, 27 Nov 2016 12:20:32 +0100 turned one error into a warning in p3filelists.cc when requesting an unexisting ref
|
||||
8b22924 defnax Sun, 27 Nov 2016 18:00:26 +0100 Merge branch 'master' of https://github.com/RetroShare/RetroShare
|
||||
cfd4afd defnax Sun, 27 Nov 2016 17:59:15 +0100 Update emoticons file
|
||||
5216636 defnax Sun, 27 Nov 2016 16:42:45 +0100 Merge pull request #585 from PhenomRetroShare/Add_RSELidedItemDelegate
|
||||
486c113 defnax Sun, 27 Nov 2016 15:58:53 +0100 Changed smiley widget default width Update Emotes file
|
||||
0f63921 defnax Sun, 27 Nov 2016 00:11:21 +0100 Fixing icon size for smiley widget.
|
||||
2a758dd csoler Sat, 26 Nov 2016 19:19:15 +0100 changed shared files tree header when updating
|
||||
aa4ecd7 csoler Sat, 26 Nov 2016 18:58:02 +0100 added limit to calls of PreMods() in SharedFilesDialog so as to keep CPU load minimal when updating dirs from friends. Disabled sorting when new data comes.
|
||||
d01644c csoler Sat, 26 Nov 2016 11:26:02 +0100 added back the test for local/remote in SharedFilesDialog as it reduces the load anyway
|
||||
|
||||
@ -6,6 +6,8 @@
|
||||
#include <stdint.h>
|
||||
#include <ostream>
|
||||
|
||||
#include "util/rsdeprecate.h"
|
||||
|
||||
namespace resource_api
|
||||
{
|
||||
// things to clean up:
|
||||
@ -181,18 +183,20 @@ private:
|
||||
class Request
|
||||
{
|
||||
public:
|
||||
Request(StreamBase& stream): mStream(stream), mMethod(GET){}
|
||||
Request(StreamBase& stream) : mStream(stream), mMethod(GET){}
|
||||
|
||||
bool isGet(){ return mMethod == GET;}
|
||||
bool isPut(){ return mMethod == PUT;}
|
||||
bool isDelete(){ return mMethod == DELETE_AA;}
|
||||
bool isExec(){ return mMethod == EXEC;}
|
||||
RS_DEPRECATED bool isGet(){ return mMethod == GET;}
|
||||
RS_DEPRECATED bool isPut(){ return mMethod == PUT;}
|
||||
RS_DEPRECATED bool isDelete(){ return mMethod == DELETE_AA;}
|
||||
RS_DEPRECATED bool isExec(){ return mMethod == EXEC;}
|
||||
|
||||
// path is the adress to the resource
|
||||
// if the path has multiple parts which get handled by different handlers,
|
||||
// then each handler should pop the top element
|
||||
std::stack<std::string> mPath;
|
||||
std::string mFullPath;
|
||||
/**
|
||||
* Path is the adress to the resource if the path has multiple parts which
|
||||
* get handled by different handlers, then each handler should pop the top
|
||||
* element
|
||||
*/
|
||||
std::stack<std::string> mPath;
|
||||
std::string mFullPath;
|
||||
bool setPath(const std::string &reqPath)
|
||||
{
|
||||
std::string str;
|
||||
@ -213,19 +217,16 @@ public:
|
||||
return true;
|
||||
}
|
||||
|
||||
// parameters should be used to influence the result
|
||||
// for example include or exclude some information
|
||||
// question: when to use parameters, and when to use the data field?
|
||||
// it would be easier to have only one thing...
|
||||
// UNUSED: was never implemented
|
||||
//std::vector<std::pair<std::string, std::string> > mParameters;
|
||||
/// Contains data for new resources
|
||||
StreamBase& mStream;
|
||||
|
||||
// contains data for new resources
|
||||
StreamBase& mStream;
|
||||
|
||||
// use the is*() methods to query the method type:
|
||||
enum Method { GET, PUT, DELETE_AA, EXEC};// something is wrong with DELETE, it won't compile with it
|
||||
Method mMethod;
|
||||
/**
|
||||
* @deprecated
|
||||
* Method and derivated stuff usage is deprecated as it make implementation
|
||||
* more complex and less readable without advantage
|
||||
*/
|
||||
enum Method { GET, PUT, DELETE_AA, EXEC};
|
||||
RS_DEPRECATED Method mMethod;
|
||||
};
|
||||
|
||||
// new notes on responses
|
||||
|
||||
@ -155,6 +155,9 @@ ChatHandler::ChatHandler(StateTokenServer *sts, RsNotify *notify, RsMsgs *msgs,
|
||||
addResourceHandler("receive_status", this, &ChatHandler::handleReceiveStatus);
|
||||
addResourceHandler("send_status", this, &ChatHandler::handleSendStatus);
|
||||
addResourceHandler("unread_msgs", this, &ChatHandler::handleUnreadMsgs);
|
||||
addResourceHandler("initiate_distant_chat", this, &ChatHandler::handleInitiateDistantChatConnexion);
|
||||
addResourceHandler("distant_chat_status", this, &ChatHandler::handleDistantChatStatus);
|
||||
addResourceHandler("close_distant_chat", this, &ChatHandler::handleCloseDistantChatConnexion);
|
||||
}
|
||||
|
||||
ChatHandler::~ChatHandler()
|
||||
@ -928,12 +931,14 @@ void ChatHandler::handleMessages(Request &req, Response &resp)
|
||||
return;
|
||||
}
|
||||
std::map<ChatId, std::list<Msg> >::iterator mit = mMsgs.find(id);
|
||||
if(mit == mMsgs.end())
|
||||
{
|
||||
resp.mStateToken = mMsgStateToken; // even set state token, if not found yet, maybe later messages arrive and then the chat id will be found
|
||||
resp.setFail("chat with id=\""+req.mPath.top()+"\" not found");
|
||||
return;
|
||||
}
|
||||
if(mit == mMsgs.end())
|
||||
{
|
||||
/* set state token, even if not found yet, maybe later messages arrive
|
||||
* and then the chat id will be found */
|
||||
resp.mStateToken = mMsgStateToken;
|
||||
resp.setFail("chat with id=\""+req.mPath.top()+"\" not found");
|
||||
return;
|
||||
}
|
||||
resp.mStateToken = mMsgStateToken;
|
||||
handlePaginationRequest(req, resp, mit->second);
|
||||
}
|
||||
@ -954,7 +959,6 @@ void ChatHandler::handleSendMessage(Request &req, Response &resp)
|
||||
resp.setOk();
|
||||
else
|
||||
resp.setFail("failed to send message");
|
||||
|
||||
}
|
||||
|
||||
void ChatHandler::handleMarkChatAsRead(Request &req, Response &resp)
|
||||
@ -1125,4 +1129,63 @@ void ChatHandler::handleUnreadMsgs(Request &/*req*/, Response &resp)
|
||||
resp.mStateToken = mUnreadMsgsStateToken;
|
||||
}
|
||||
|
||||
void ChatHandler::handleInitiateDistantChatConnexion(Request& req, Response& resp)
|
||||
{
|
||||
std::string own_gxs_hex, remote_gxs_hex;
|
||||
|
||||
req.mStream << makeKeyValueReference("own_gxs_hex", own_gxs_hex)
|
||||
<< makeKeyValueReference("remote_gxs_hex", remote_gxs_hex);
|
||||
|
||||
RsGxsId sender_id(own_gxs_hex);
|
||||
if(sender_id.isNull())
|
||||
{
|
||||
resp.setFail("own_gxs_hex is invalid");
|
||||
return;
|
||||
}
|
||||
|
||||
RsGxsId receiver_id(remote_gxs_hex);
|
||||
if(receiver_id.isNull())
|
||||
{
|
||||
resp.setFail("remote_gxs_hex is invalid");
|
||||
return;
|
||||
}
|
||||
|
||||
DistantChatPeerId distant_chat_id;
|
||||
uint32_t error_code;
|
||||
|
||||
if(mRsMsgs->initiateDistantChatConnexion(receiver_id, sender_id, distant_chat_id, error_code))
|
||||
resp.setOk();
|
||||
else resp.setFail("Failed to initiate distant chat");
|
||||
|
||||
ChatId chat_id(distant_chat_id);
|
||||
resp.mDataStream << makeKeyValue("chat_id", chat_id.toStdString())
|
||||
<< makeKeyValueReference("error_code", error_code);
|
||||
}
|
||||
|
||||
void ChatHandler::handleDistantChatStatus(Request& req, Response& resp)
|
||||
{
|
||||
std::string distant_chat_hex;
|
||||
req.mStream << makeKeyValueReference("chat_id", distant_chat_hex);
|
||||
|
||||
ChatId id(distant_chat_hex);
|
||||
DistantChatPeerInfo info;
|
||||
if(mRsMsgs->getDistantChatStatus(id.toDistantChatId(), info)) resp.setOk();
|
||||
else resp.setFail("Failed to get status for distant chat");
|
||||
|
||||
resp.mDataStream << makeKeyValue("own_gxs_hex", info.own_id.toStdString())
|
||||
<< makeKeyValue("remote_gxs_hex", info.to_id.toStdString())
|
||||
<< makeKeyValue("chat_id", info.peer_id.toStdString())
|
||||
<< makeKeyValue("status", info.status);
|
||||
}
|
||||
|
||||
void ChatHandler::handleCloseDistantChatConnexion(Request& req, Response& resp)
|
||||
{
|
||||
std::string distant_chat_hex;
|
||||
req.mStream << makeKeyValueReference("distant_chat_hex", distant_chat_hex);
|
||||
|
||||
DistantChatPeerId chat_id(distant_chat_hex);
|
||||
if (mRsMsgs->closeDistantChatConnexion(chat_id)) resp.setOk();
|
||||
else resp.setFail("Failed to close distant chat");
|
||||
}
|
||||
|
||||
} // namespace resource_api
|
||||
|
||||
@ -11,9 +11,10 @@ class RsIdentity;
|
||||
namespace resource_api
|
||||
{
|
||||
|
||||
class UnreadMsgNotify{
|
||||
class UnreadMsgNotify
|
||||
{
|
||||
public:
|
||||
virtual void notifyUnreadMsgCountChanged(const RsPeerId& peer, uint32_t count) = 0;
|
||||
virtual void notifyUnreadMsgCountChanged(const RsPeerId& peer, uint32_t count) = 0;
|
||||
};
|
||||
|
||||
class ChatHandler: public ResourceRouter, NotifyClient, Tickable
|
||||
@ -128,6 +129,9 @@ private:
|
||||
ResponseTask *handleReceiveStatus(Request& req, Response& resp);
|
||||
void handleSendStatus(Request& req, Response& resp);
|
||||
void handleUnreadMsgs(Request& req, Response& resp);
|
||||
void handleInitiateDistantChatConnexion(Request& req, Response& resp);
|
||||
void handleDistantChatStatus(Request& req, Response& resp);
|
||||
void handleCloseDistantChatConnexion(Request& req, Response& resp);
|
||||
|
||||
void getPlainText(const std::string& in, std::string &out, std::vector<Triple> &links);
|
||||
// last parameter is only used for lobbies!
|
||||
|
||||
@ -275,31 +275,30 @@ bool DistantChatService::initiateDistantChatConnexion(const RsGxsId& to_gxs_id,
|
||||
|
||||
bool DistantChatService::getDistantChatStatus(const DistantChatPeerId& tunnel_id, DistantChatPeerInfo& cinfo)
|
||||
{
|
||||
RsStackMutex stack(mDistantChatMtx); /********** STACK LOCKED MTX ******/
|
||||
RS_STACK_MUTEX(mDistantChatMtx);
|
||||
|
||||
RsGxsTunnelService::GxsTunnelInfo tinfo ;
|
||||
RsGxsTunnelService::GxsTunnelInfo tinfo;
|
||||
|
||||
if(!mGxsTunnels->getTunnelInfo(RsGxsTunnelId(tunnel_id),tinfo))
|
||||
return false;
|
||||
if(!mGxsTunnels->getTunnelInfo(RsGxsTunnelId(tunnel_id),tinfo)) return false;
|
||||
|
||||
cinfo.to_id = tinfo.destination_gxs_id;
|
||||
cinfo.own_id = tinfo.source_gxs_id;
|
||||
cinfo.peer_id = tunnel_id;
|
||||
cinfo.to_id = tinfo.destination_gxs_id;
|
||||
cinfo.own_id = tinfo.source_gxs_id;
|
||||
cinfo.peer_id = tunnel_id;
|
||||
|
||||
switch(tinfo.tunnel_status)
|
||||
{
|
||||
case RsGxsTunnelService::RS_GXS_TUNNEL_STATUS_CAN_TALK : cinfo.status = RS_DISTANT_CHAT_STATUS_CAN_TALK;
|
||||
break ;
|
||||
case RsGxsTunnelService::RS_GXS_TUNNEL_STATUS_TUNNEL_DN: cinfo.status = RS_DISTANT_CHAT_STATUS_TUNNEL_DN ;
|
||||
break ;
|
||||
case RsGxsTunnelService::RS_GXS_TUNNEL_STATUS_REMOTELY_CLOSED: cinfo.status = RS_DISTANT_CHAT_STATUS_REMOTELY_CLOSED ;
|
||||
break ;
|
||||
default:
|
||||
case RsGxsTunnelService::RS_GXS_TUNNEL_STATUS_UNKNOWN: cinfo.status = RS_DISTANT_CHAT_STATUS_UNKNOWN;
|
||||
break ;
|
||||
}
|
||||
switch(tinfo.tunnel_status)
|
||||
{
|
||||
case RsGxsTunnelService::RS_GXS_TUNNEL_STATUS_CAN_TALK :
|
||||
cinfo.status = RS_DISTANT_CHAT_STATUS_CAN_TALK; break;
|
||||
case RsGxsTunnelService::RS_GXS_TUNNEL_STATUS_TUNNEL_DN:
|
||||
cinfo.status = RS_DISTANT_CHAT_STATUS_TUNNEL_DN; break;
|
||||
case RsGxsTunnelService::RS_GXS_TUNNEL_STATUS_REMOTELY_CLOSED:
|
||||
cinfo.status = RS_DISTANT_CHAT_STATUS_REMOTELY_CLOSED; break;
|
||||
case RsGxsTunnelService::RS_GXS_TUNNEL_STATUS_UNKNOWN:
|
||||
default:
|
||||
cinfo.status = RS_DISTANT_CHAT_STATUS_UNKNOWN; break;
|
||||
}
|
||||
|
||||
return true ;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool DistantChatService::closeDistantChatConnexion(const DistantChatPeerId &tunnel_id)
|
||||
|
||||
@ -292,14 +292,11 @@ void p3ChatService::checkSizeAndSendMessage(RsChatMsgItem *msg)
|
||||
|
||||
bool p3ChatService::isOnline(const RsPeerId& pid)
|
||||
{
|
||||
// check if the id is a tunnel id or a peer id.
|
||||
|
||||
DistantChatPeerInfo dcpinfo;
|
||||
|
||||
if(getDistantChatStatus(DistantChatPeerId(pid),dcpinfo))
|
||||
return dcpinfo.status == RS_DISTANT_CHAT_STATUS_CAN_TALK ;
|
||||
else
|
||||
return mServiceCtrl->isPeerConnected(getServiceInfo().mServiceType, pid);
|
||||
// check if the id is a tunnel id or a peer id.
|
||||
DistantChatPeerInfo dcpinfo;
|
||||
if(getDistantChatStatus(DistantChatPeerId(pid),dcpinfo))
|
||||
return dcpinfo.status == RS_DISTANT_CHAT_STATUS_CAN_TALK;
|
||||
else return mServiceCtrl->isPeerConnected(getServiceInfo().mServiceType, pid);
|
||||
}
|
||||
|
||||
bool p3ChatService::sendChat(ChatId destination, std::string msg)
|
||||
@ -318,8 +315,7 @@ bool p3ChatService::sendChat(ChatId destination, std::string msg)
|
||||
}
|
||||
// destination is peer or distant
|
||||
#ifdef CHAT_DEBUG
|
||||
std::cerr << "p3ChatService::sendChat()";
|
||||
std::cerr << std::endl;
|
||||
std::cerr << "p3ChatService::sendChat()" << std::endl;
|
||||
#endif
|
||||
|
||||
RsPeerId vpid;
|
||||
@ -341,12 +337,12 @@ bool p3ChatService::sendChat(ChatId destination, std::string msg)
|
||||
message.online = true;
|
||||
|
||||
if(!isOnline(vpid))
|
||||
{
|
||||
/* peer is offline, add to outgoing list */
|
||||
{
|
||||
RsStackMutex stack(mChatMtx); /********** STACK LOCKED MTX ******/
|
||||
privateOutgoingList.push_back(ci);
|
||||
}
|
||||
{
|
||||
/* peer is offline, add to outgoing list */
|
||||
{
|
||||
RS_STACK_MUTEX(mChatMtx);
|
||||
privateOutgoingList.push_back(ci);
|
||||
}
|
||||
|
||||
message.online = false;
|
||||
RsServer::notify()->notifyChatMessage(message);
|
||||
|
||||
@ -90,7 +90,7 @@ bool RsGxsMessageCleanUp::clean()
|
||||
RsGxsMsgMetaData* meta = *vit;
|
||||
|
||||
// check if expired
|
||||
bool remove = (meta->mPublishTs + store_period) < now;
|
||||
bool remove = store_period > 0 && (meta->mPublishTs + store_period) < now;
|
||||
|
||||
// check client does not want the message kept regardless of age
|
||||
remove &= !(meta->mMsgStatus & GXS_SERV::GXS_MSG_STATUS_KEEP);
|
||||
|
||||
@ -1464,7 +1464,7 @@ RsGxsId p3GxsTunnelService::destinationGxsIdFromHash(const TurtleFileHash& sum)
|
||||
|
||||
bool p3GxsTunnelService::getTunnelInfo(const RsGxsTunnelId& tunnel_id,GxsTunnelInfo& info)
|
||||
{
|
||||
RsStackMutex stack(mGxsTunnelMtx); /********** STACK LOCKED MTX ******/
|
||||
RS_STACK_MUTEX(mGxsTunnelMtx);
|
||||
|
||||
std::map<RsGxsTunnelId,GxsTunnelPeerInfo>::const_iterator it = _gxs_tunnel_contacts.find(tunnel_id) ;
|
||||
|
||||
|
||||
@ -527,7 +527,8 @@ HEADERS += util/folderiterator.h \
|
||||
util/rstickevent.h \
|
||||
util/rsrecogn.h \
|
||||
util/rsscopetimer.h \
|
||||
util/stacktrace.h
|
||||
util/stacktrace.h \
|
||||
util/rsdeprecate.h
|
||||
|
||||
SOURCES += ft/ftchunkmap.cc \
|
||||
ft/ftcontroller.cc \
|
||||
@ -540,7 +541,7 @@ SOURCES += ft/ftchunkmap.cc \
|
||||
ft/fttransfermodule.cc \
|
||||
ft/ftturtlefiletransferitem.cc
|
||||
|
||||
SOURCES += crypto/chacha20.cpp
|
||||
SOURCES += crypto/chacha20.cpp
|
||||
|
||||
SOURCES += chat/distantchat.cc \
|
||||
chat/p3chatservice.cc \
|
||||
|
||||
@ -79,22 +79,21 @@ ChatId::ChatId(ChatLobbyId id):
|
||||
lobby_id = id;
|
||||
}
|
||||
|
||||
ChatId::ChatId(std::string str):
|
||||
lobby_id(0)
|
||||
ChatId::ChatId(std::string str) : lobby_id(0)
|
||||
{
|
||||
type = TYPE_NOT_SET;
|
||||
if(str.empty())
|
||||
return;
|
||||
type = TYPE_NOT_SET;
|
||||
if(str.empty()) return;
|
||||
|
||||
if(str[0] == 'P')
|
||||
{
|
||||
type = TYPE_PRIVATE;
|
||||
peer_id = RsPeerId(str.substr(1));
|
||||
}
|
||||
else if(str[0] == 'D')
|
||||
{
|
||||
type = TYPE_PRIVATE_DISTANT;
|
||||
distant_chat_id == DistantChatPeerId(str.substr(1));
|
||||
}
|
||||
}
|
||||
else if(str[0] == 'D')
|
||||
{
|
||||
type = TYPE_PRIVATE_DISTANT;
|
||||
distant_chat_id = DistantChatPeerId(str.substr(1));
|
||||
}
|
||||
else if(str[0] == 'L')
|
||||
{
|
||||
if(sizeof(ChatLobbyId) != 8)
|
||||
@ -401,7 +400,7 @@ bool p3Msgs::resetMessageStandardTagTypes(MsgTagType& tags)
|
||||
/****************************************/
|
||||
bool p3Msgs::sendChat(ChatId destination, std::string msg)
|
||||
{
|
||||
return mChatSrv->sendChat(destination, msg);
|
||||
return mChatSrv->sendChat(destination, msg);
|
||||
}
|
||||
|
||||
uint32_t p3Msgs::getMaxMessageSecuritySize(int type)
|
||||
|
||||
34
libretroshare/src/util/rsdeprecate.h
Normal file
34
libretroshare/src/util/rsdeprecate.h
Normal file
@ -0,0 +1,34 @@
|
||||
#pragma once
|
||||
/*
|
||||
* RetroShare deprecation macros
|
||||
* Copyright (C) 2016 Gioacchino Mazzurco <gio@eigenlab.org>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
|
||||
# define RS_DEPRECATED __attribute__((__deprecated__))
|
||||
#elif defined(_MSC_VER) && (_MSC_VER >= 1300)
|
||||
# define RS_DEPRECATED __declspec(deprecated)
|
||||
#else
|
||||
# define RS_DEPRECATED
|
||||
#endif
|
||||
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
|
||||
# define RS_DEPRECATED_FOR(f) __attribute__((__deprecated__("Use '" #f "' instead")))
|
||||
#elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320)
|
||||
# define RS_DEPRECATED_FOR(f) __declspec(deprecated("is deprecated. Use '" #f "' instead"))
|
||||
#else
|
||||
# define RS_DEPRECATED_FOR(f) RS_DEPRECATED
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user