diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-02-15 15:08:54 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-02-15 15:08:59 +0100 |
| commit | 476cc47da084633ac17b9b3c9257fab425b3bbba (patch) | |
| tree | c4bfe9386ffe2ea44937c298aa39cb6b92e41bd1 | |
| parent | d8e8b06bd0659b35e51effe35400408ec15bb09b (diff) | |
| parent | 4b6ccccc16b615c01939678e589f8e09cfc15d70 (diff) | |
Merge #9758: Selectively suppress deprecation warnings
4b6cccc Selectively suppress deprecation warnings (Jonas Schnelli)
| -rw-r--r-- | src/qt/guiutil.cpp | 3 | ||||
| -rw-r--r-- | src/qt/paymentrequestplus.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 5d6c0e2e31..e0961fe7dd 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -762,6 +762,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> @@ -824,6 +826,7 @@ bool SetStartOnSystemStartup(bool fAutoStart) } return true; } +#pragma GCC diagnostic pop #else bool GetStartOnSystemStartup() { return false; } diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h index ee1a37d83c..a2fea3fdc6 100644 --- a/src/qt/paymentrequestplus.h +++ b/src/qt/paymentrequestplus.h @@ -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" |