Merge #9758: Selectively suppress deprecation warnings
4b6cccc Selectively suppress deprecation warnings (Jonas Schnelli)
This commit is contained in:
parent
f2b5560083
commit
136d8606c8
@ -809,6 +809,8 @@ bool SetStartOnSystemStartup(bool fAutoStart)
|
||||
|
||||
|
||||
#elif defined(Q_OS_MAC)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
// based on: https://github.com/Mozketo/LaunchAtLoginController/blob/master/LaunchAtLoginController.m
|
||||
|
||||
#include <CoreFoundation/CoreFoundation.h>
|
||||
@ -871,6 +873,7 @@ bool SetStartOnSystemStartup(bool fAutoStart)
|
||||
}
|
||||
return true;
|
||||
}
|
||||
#pragma GCC diagnostic pop
|
||||
#else
|
||||
|
||||
bool GetStartOnSystemStartup() { return false; }
|
||||
|
@ -5,7 +5,10 @@
|
||||
#ifndef BITCOIN_QT_PAYMENTREQUESTPLUS_H
|
||||
#define BITCOIN_QT_PAYMENTREQUESTPLUS_H
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
#include "paymentrequest.pb.h"
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
#include "base58.h"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user