Browse Source

Merge #9758: Selectively suppress deprecation warnings

4b6cccc Selectively suppress deprecation warnings (Jonas Schnelli)
0.14
Wladimir J. van der Laan 8 years ago
parent
commit
476cc47da0
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 3
      src/qt/guiutil.cpp
  2. 3
      src/qt/paymentrequestplus.h

3
src/qt/guiutil.cpp

@ -762,6 +762,8 @@ bool SetStartOnSystemStartup(bool fAutoStart) @@ -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) @@ -824,6 +826,7 @@ bool SetStartOnSystemStartup(bool fAutoStart)
}
return true;
}
#pragma GCC diagnostic pop
#else
bool GetStartOnSystemStartup() { return false; }

3
src/qt/paymentrequestplus.h

@ -5,7 +5,10 @@ @@ -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…
Cancel
Save