Skip to content

Commit 476cc47

Browse files
committed
Merge #9758: Selectively suppress deprecation warnings
4b6cccc Selectively suppress deprecation warnings (Jonas Schnelli)
2 parents d8e8b06 + 4b6cccc commit 476cc47

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

src/qt/guiutil.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,8 @@ bool SetStartOnSystemStartup(bool fAutoStart)
762762

763763

764764
#elif defined(Q_OS_MAC)
765+
#pragma GCC diagnostic push
766+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
765767
// based on: https://github.com/Mozketo/LaunchAtLoginController/blob/master/LaunchAtLoginController.m
766768

767769
#include <CoreFoundation/CoreFoundation.h>
@@ -824,6 +826,7 @@ bool SetStartOnSystemStartup(bool fAutoStart)
824826
}
825827
return true;
826828
}
829+
#pragma GCC diagnostic pop
827830
#else
828831

829832
bool GetStartOnSystemStartup() { return false; }

src/qt/paymentrequestplus.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
#ifndef BITCOIN_QT_PAYMENTREQUESTPLUS_H
66
#define BITCOIN_QT_PAYMENTREQUESTPLUS_H
77

8+
#pragma GCC diagnostic push
9+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
810
#include "paymentrequest.pb.h"
11+
#pragma GCC diagnostic pop
912

1013
#include "base58.h"
1114

0 commit comments

Comments
 (0)