convert C-style (void) parameter lists to C++ style ()
This commit is contained in:
parent
f0a6a922fe
commit
3ccfa34b32
16 changed files with 27 additions and 27 deletions
|
@ -31,7 +31,7 @@ static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\"";
|
||||||
class HTTPRPCTimer : public RPCTimerBase
|
class HTTPRPCTimer : public RPCTimerBase
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
HTTPRPCTimer(struct event_base* eventBase, std::function<void(void)>& func, int64_t millis) :
|
HTTPRPCTimer(struct event_base* eventBase, std::function<void()>& func, int64_t millis) :
|
||||||
ev(eventBase, false, func)
|
ev(eventBase, false, func)
|
||||||
{
|
{
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
|
@ -53,7 +53,7 @@ public:
|
||||||
{
|
{
|
||||||
return "HTTP";
|
return "HTTP";
|
||||||
}
|
}
|
||||||
RPCTimerBase* NewTimer(std::function<void(void)>& func, int64_t millis) override
|
RPCTimerBase* NewTimer(std::function<void()>& func, int64_t millis) override
|
||||||
{
|
{
|
||||||
return new HTTPRPCTimer(base, func, millis);
|
return new HTTPRPCTimer(base, func, millis);
|
||||||
}
|
}
|
||||||
|
|
|
@ -505,7 +505,7 @@ static void httpevent_callback_fn(evutil_socket_t, short, void* data)
|
||||||
delete self;
|
delete self;
|
||||||
}
|
}
|
||||||
|
|
||||||
HTTPEvent::HTTPEvent(struct event_base* base, bool _deleteWhenTriggered, const std::function<void(void)>& _handler):
|
HTTPEvent::HTTPEvent(struct event_base* base, bool _deleteWhenTriggered, const std::function<void()>& _handler):
|
||||||
deleteWhenTriggered(_deleteWhenTriggered), handler(_handler)
|
deleteWhenTriggered(_deleteWhenTriggered), handler(_handler)
|
||||||
{
|
{
|
||||||
ev = event_new(base, -1, 0, httpevent_callback_fn, this);
|
ev = event_new(base, -1, 0, httpevent_callback_fn, this);
|
||||||
|
|
|
@ -134,7 +134,7 @@ public:
|
||||||
* deleteWhenTriggered deletes this event object after the event is triggered (and the handler called)
|
* deleteWhenTriggered deletes this event object after the event is triggered (and the handler called)
|
||||||
* handler is the handler to call when the event is triggered.
|
* handler is the handler to call when the event is triggered.
|
||||||
*/
|
*/
|
||||||
HTTPEvent(struct event_base* base, bool deleteWhenTriggered, const std::function<void(void)>& handler);
|
HTTPEvent(struct event_base* base, bool deleteWhenTriggered, const std::function<void()>& handler);
|
||||||
~HTTPEvent();
|
~HTTPEvent();
|
||||||
|
|
||||||
/** Trigger the event. If tv is 0, trigger it immediately. Otherwise trigger it after
|
/** Trigger the event. If tv is 0, trigger it immediately. Otherwise trigger it after
|
||||||
|
@ -143,7 +143,7 @@ public:
|
||||||
void trigger(struct timeval* tv);
|
void trigger(struct timeval* tv);
|
||||||
|
|
||||||
bool deleteWhenTriggered;
|
bool deleteWhenTriggered;
|
||||||
std::function<void(void)> handler;
|
std::function<void()> handler;
|
||||||
private:
|
private:
|
||||||
struct event* ev;
|
struct event* ev;
|
||||||
};
|
};
|
||||||
|
|
|
@ -684,7 +684,7 @@ static void ThreadImport(std::vector<fs::path> vImportFiles)
|
||||||
* Ensure that Bitcoin is running in a usable environment with all
|
* Ensure that Bitcoin is running in a usable environment with all
|
||||||
* necessary library support.
|
* necessary library support.
|
||||||
*/
|
*/
|
||||||
static bool InitSanityCheck(void)
|
static bool InitSanityCheck()
|
||||||
{
|
{
|
||||||
if(!ECC_InitSanityCheck()) {
|
if(!ECC_InitSanityCheck()) {
|
||||||
InitError("Elliptic curve cryptography sanity check failure. Aborting.");
|
InitError("Elliptic curve cryptography sanity check failure. Aborting.");
|
||||||
|
|
|
@ -181,12 +181,12 @@ struct CExtKey {
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Initialize the elliptic curve support. May not be called twice without calling ECC_Stop first. */
|
/** Initialize the elliptic curve support. May not be called twice without calling ECC_Stop first. */
|
||||||
void ECC_Start(void);
|
void ECC_Start();
|
||||||
|
|
||||||
/** Deinitialize the elliptic curve support. No-op if ECC_Start wasn't called first. */
|
/** Deinitialize the elliptic curve support. No-op if ECC_Start wasn't called first. */
|
||||||
void ECC_Stop(void);
|
void ECC_Stop();
|
||||||
|
|
||||||
/** Check that required EC support is available at runtime. */
|
/** Check that required EC support is available at runtime. */
|
||||||
bool ECC_InitSanityCheck(void);
|
bool ECC_InitSanityCheck();
|
||||||
|
|
||||||
#endif // BITCOIN_KEY_H
|
#endif // BITCOIN_KEY_H
|
||||||
|
|
|
@ -586,7 +586,7 @@ int main(int argc, char *argv[])
|
||||||
// Need to pass name here as CAmount is a typedef (see http://qt-project.org/doc/qt-5/qmetatype.html#qRegisterMetaType)
|
// Need to pass name here as CAmount is a typedef (see http://qt-project.org/doc/qt-5/qmetatype.html#qRegisterMetaType)
|
||||||
// IMPORTANT if it is no longer a typedef use the normal variant above
|
// IMPORTANT if it is no longer a typedef use the normal variant above
|
||||||
qRegisterMetaType< CAmount >("CAmount");
|
qRegisterMetaType< CAmount >("CAmount");
|
||||||
qRegisterMetaType< std::function<void(void)> >("std::function<void(void)>");
|
qRegisterMetaType< std::function<void()> >("std::function<void()>");
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
qRegisterMetaType<WalletModel*>("WalletModel*");
|
qRegisterMetaType<WalletModel*>("WalletModel*");
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -19,7 +19,7 @@ public:
|
||||||
void showNotification(const QString &title, const QString &text);
|
void showNotification(const QString &title, const QString &text);
|
||||||
|
|
||||||
/** check if OS can handle UserNotifications */
|
/** check if OS can handle UserNotifications */
|
||||||
bool hasUserNotificationCenterSupport(void);
|
bool hasUserNotificationCenterSupport();
|
||||||
static MacNotificationHandler *instance();
|
static MacNotificationHandler *instance();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -101,7 +101,7 @@ class QtRPCTimerBase: public QObject, public RPCTimerBase
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
QtRPCTimerBase(std::function<void(void)>& _func, int64_t millis):
|
QtRPCTimerBase(std::function<void()>& _func, int64_t millis):
|
||||||
func(_func)
|
func(_func)
|
||||||
{
|
{
|
||||||
timer.setSingleShot(true);
|
timer.setSingleShot(true);
|
||||||
|
@ -111,7 +111,7 @@ public:
|
||||||
~QtRPCTimerBase() {}
|
~QtRPCTimerBase() {}
|
||||||
private:
|
private:
|
||||||
QTimer timer;
|
QTimer timer;
|
||||||
std::function<void(void)> func;
|
std::function<void()> func;
|
||||||
};
|
};
|
||||||
|
|
||||||
class QtRPCTimerInterface: public RPCTimerInterface
|
class QtRPCTimerInterface: public RPCTimerInterface
|
||||||
|
@ -119,7 +119,7 @@ class QtRPCTimerInterface: public RPCTimerInterface
|
||||||
public:
|
public:
|
||||||
~QtRPCTimerInterface() {}
|
~QtRPCTimerInterface() {}
|
||||||
const char *Name() { return "Qt"; }
|
const char *Name() { return "Qt"; }
|
||||||
RPCTimerBase* NewTimer(std::function<void(void)>& func, int64_t millis)
|
RPCTimerBase* NewTimer(std::function<void()>& func, int64_t millis)
|
||||||
{
|
{
|
||||||
return new QtRPCTimerBase(func, millis);
|
return new QtRPCTimerBase(func, millis);
|
||||||
}
|
}
|
||||||
|
|
|
@ -540,7 +540,7 @@ void RPCUnsetTimerInterface(RPCTimerInterface *iface)
|
||||||
timerInterface = nullptr;
|
timerInterface = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RPCRunLater(const std::string& name, std::function<void(void)> func, int64_t nSeconds)
|
void RPCRunLater(const std::string& name, std::function<void()> func, int64_t nSeconds)
|
||||||
{
|
{
|
||||||
if (!timerInterface)
|
if (!timerInterface)
|
||||||
throw JSONRPCError(RPC_INTERNAL_ERROR, "No timer handler registered for RPC");
|
throw JSONRPCError(RPC_INTERNAL_ERROR, "No timer handler registered for RPC");
|
||||||
|
|
|
@ -110,7 +110,7 @@ public:
|
||||||
* This is needed to cope with the case in which there is no HTTP server, but
|
* This is needed to cope with the case in which there is no HTTP server, but
|
||||||
* only GUI RPC console, and to break the dependency of pcserver on httprpc.
|
* only GUI RPC console, and to break the dependency of pcserver on httprpc.
|
||||||
*/
|
*/
|
||||||
virtual RPCTimerBase* NewTimer(std::function<void(void)>& func, int64_t millis) = 0;
|
virtual RPCTimerBase* NewTimer(std::function<void()>& func, int64_t millis) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Set the factory function for timers */
|
/** Set the factory function for timers */
|
||||||
|
@ -124,7 +124,7 @@ void RPCUnsetTimerInterface(RPCTimerInterface *iface);
|
||||||
* Run func nSeconds from now.
|
* Run func nSeconds from now.
|
||||||
* Overrides previous timer <name> (if any).
|
* Overrides previous timer <name> (if any).
|
||||||
*/
|
*/
|
||||||
void RPCRunLater(const std::string& name, std::function<void(void)> func, int64_t nSeconds);
|
void RPCRunLater(const std::string& name, std::function<void()> func, int64_t nSeconds);
|
||||||
|
|
||||||
typedef UniValue(*rpcfn_type)(const JSONRPCRequest& jsonRequest);
|
typedef UniValue(*rpcfn_type)(const JSONRPCRequest& jsonRequest);
|
||||||
|
|
||||||
|
|
|
@ -159,7 +159,7 @@ void SingleThreadedSchedulerClient::MaybeScheduleProcessQueue() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void SingleThreadedSchedulerClient::ProcessQueue() {
|
void SingleThreadedSchedulerClient::ProcessQueue() {
|
||||||
std::function<void (void)> callback;
|
std::function<void ()> callback;
|
||||||
{
|
{
|
||||||
LOCK(m_cs_callbacks_pending);
|
LOCK(m_cs_callbacks_pending);
|
||||||
if (m_are_callbacks_running) return;
|
if (m_are_callbacks_running) return;
|
||||||
|
@ -187,7 +187,7 @@ void SingleThreadedSchedulerClient::ProcessQueue() {
|
||||||
callback();
|
callback();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SingleThreadedSchedulerClient::AddToProcessQueue(std::function<void (void)> func) {
|
void SingleThreadedSchedulerClient::AddToProcessQueue(std::function<void ()> func) {
|
||||||
assert(m_pscheduler);
|
assert(m_pscheduler);
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
|
@ -40,7 +40,7 @@ public:
|
||||||
CScheduler();
|
CScheduler();
|
||||||
~CScheduler();
|
~CScheduler();
|
||||||
|
|
||||||
typedef std::function<void(void)> Function;
|
typedef std::function<void()> Function;
|
||||||
|
|
||||||
// Call func at/after time t
|
// Call func at/after time t
|
||||||
void schedule(Function f, boost::chrono::system_clock::time_point t=boost::chrono::system_clock::now());
|
void schedule(Function f, boost::chrono::system_clock::time_point t=boost::chrono::system_clock::now());
|
||||||
|
@ -99,7 +99,7 @@ private:
|
||||||
CScheduler *m_pscheduler;
|
CScheduler *m_pscheduler;
|
||||||
|
|
||||||
CCriticalSection m_cs_callbacks_pending;
|
CCriticalSection m_cs_callbacks_pending;
|
||||||
std::list<std::function<void (void)>> m_callbacks_pending GUARDED_BY(m_cs_callbacks_pending);
|
std::list<std::function<void ()>> m_callbacks_pending GUARDED_BY(m_cs_callbacks_pending);
|
||||||
bool m_are_callbacks_running GUARDED_BY(m_cs_callbacks_pending) = false;
|
bool m_are_callbacks_running GUARDED_BY(m_cs_callbacks_pending) = false;
|
||||||
|
|
||||||
void MaybeScheduleProcessQueue();
|
void MaybeScheduleProcessQueue();
|
||||||
|
@ -114,7 +114,7 @@ public:
|
||||||
* Practically, this means that callbacks can behave as if they are executed
|
* Practically, this means that callbacks can behave as if they are executed
|
||||||
* in order by a single thread.
|
* in order by a single thread.
|
||||||
*/
|
*/
|
||||||
void AddToProcessQueue(std::function<void (void)> func);
|
void AddToProcessQueue(std::function<void ()> func);
|
||||||
|
|
||||||
// Processes all remaining queue members on the calling thread, blocking until queue is empty
|
// Processes all remaining queue members on the calling thread, blocking until queue is empty
|
||||||
// Must be called after the CScheduler has no remaining processing threads!
|
// Must be called after the CScheduler has no remaining processing threads!
|
||||||
|
|
|
@ -200,7 +200,7 @@ static void TestChaCha20(const std::string &hexkey, uint64_t nonce, uint64_t see
|
||||||
BOOST_CHECK(out == outres);
|
BOOST_CHECK(out == outres);
|
||||||
}
|
}
|
||||||
|
|
||||||
static std::string LongTestString(void) {
|
static std::string LongTestString() {
|
||||||
std::string ret;
|
std::string ret;
|
||||||
for (int i=0; i<200000; i++) {
|
for (int i=0; i<200000; i++) {
|
||||||
ret += (unsigned char)(i);
|
ret += (unsigned char)(i);
|
||||||
|
|
|
@ -1248,7 +1248,7 @@ fs::path AbsPathForConfigVal(const fs::path& path, bool net_specific)
|
||||||
return fs::absolute(path, GetDataDir(net_specific));
|
return fs::absolute(path, GetDataDir(net_specific));
|
||||||
}
|
}
|
||||||
|
|
||||||
int ScheduleBatchPriority(void)
|
int ScheduleBatchPriority()
|
||||||
{
|
{
|
||||||
#ifdef SCHED_BATCH
|
#ifdef SCHED_BATCH
|
||||||
const static sched_param param{0};
|
const static sched_param param{0};
|
||||||
|
|
|
@ -347,7 +347,7 @@ std::string CopyrightHolders(const std::string& strPrefix);
|
||||||
* @return The return value of sched_setschedule(), or 1 on systems without
|
* @return The return value of sched_setschedule(), or 1 on systems without
|
||||||
* sched_setschedule().
|
* sched_setschedule().
|
||||||
*/
|
*/
|
||||||
int ScheduleBatchPriority(void);
|
int ScheduleBatchPriority();
|
||||||
|
|
||||||
namespace util {
|
namespace util {
|
||||||
|
|
||||||
|
|
|
@ -4682,7 +4682,7 @@ int VersionBitsTipStateSinceHeight(const Consensus::Params& params, Consensus::D
|
||||||
|
|
||||||
static const uint64_t MEMPOOL_DUMP_VERSION = 1;
|
static const uint64_t MEMPOOL_DUMP_VERSION = 1;
|
||||||
|
|
||||||
bool LoadMempool(void)
|
bool LoadMempool()
|
||||||
{
|
{
|
||||||
const CChainParams& chainparams = Params();
|
const CChainParams& chainparams = Params();
|
||||||
int64_t nExpiryTimeout = gArgs.GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60;
|
int64_t nExpiryTimeout = gArgs.GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60;
|
||||||
|
@ -4759,7 +4759,7 @@ bool LoadMempool(void)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DumpMempool(void)
|
bool DumpMempool()
|
||||||
{
|
{
|
||||||
int64_t start = GetTimeMicros();
|
int64_t start = GetTimeMicros();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue