Merge #9758: Selectively suppress deprecation warnings
4b6cccc
Selectively suppress deprecation warnings (Jonas Schnelli)
This commit is contained in:
commit
476cc47da0
2 changed files with 6 additions and 0 deletions
|
@ -762,6 +762,8 @@ bool SetStartOnSystemStartup(bool fAutoStart)
|
||||||
|
|
||||||
|
|
||||||
#elif defined(Q_OS_MAC)
|
#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
|
// based on: https://github.com/Mozketo/LaunchAtLoginController/blob/master/LaunchAtLoginController.m
|
||||||
|
|
||||||
#include <CoreFoundation/CoreFoundation.h>
|
#include <CoreFoundation/CoreFoundation.h>
|
||||||
|
@ -824,6 +826,7 @@ bool SetStartOnSystemStartup(bool fAutoStart)
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
#else
|
#else
|
||||||
|
|
||||||
bool GetStartOnSystemStartup() { return false; }
|
bool GetStartOnSystemStartup() { return false; }
|
||||||
|
|
|
@ -5,7 +5,10 @@
|
||||||
#ifndef BITCOIN_QT_PAYMENTREQUESTPLUS_H
|
#ifndef BITCOIN_QT_PAYMENTREQUESTPLUS_H
|
||||||
#define BITCOIN_QT_PAYMENTREQUESTPLUS_H
|
#define BITCOIN_QT_PAYMENTREQUESTPLUS_H
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||||
#include "paymentrequest.pb.h"
|
#include "paymentrequest.pb.h"
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
|
||||||
#include "base58.h"
|
#include "base58.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue