zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge #9758: Selectively suppress deprecation warnings 

4b6cccc Selectively suppress deprecation warnings (Jonas Schnelli)
This commit is contained in:
Wladimir J. van der Laan 2017-02-15 15:08:54 +01:00
parent d8e8b06bd0 4b6ccccc16
commit 476cc47da0
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt/guiutil.cpp
View File

@ -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; }

3
src/qt/paymentrequestplus.h
View File

@ -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"