dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Disable clang format where versions disagree (#1562)

Browse source
This commit is contained in:
cryptocode 2019-01-09 23:25:18 +01:00 • committed by Zach Hyatt
commit 7d07afec21
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nano/lib/interface.h
View file

@ -9,7 +9,7 @@ typedef unsigned char * xrb_uint128; // 16byte array for public and private keys
typedef unsigned char * xrb_uint256; // 32byte array for public and private keys typedef unsigned char * xrb_uint256; // 32byte array for public and private keys
typedef unsigned char * xrb_uint512; // 64byte array for signatures typedef unsigned char * xrb_uint512; // 64byte array for signatures
typedef void * xrb_transaction; typedef void * xrb_transaction;
// clang-format off
// Convert amount bytes 'source' to a 40 byte null-terminated decimal string 'destination' // Convert amount bytes 'source' to a 40 byte null-terminated decimal string 'destination'
[[deprecated]] [[deprecated]]
void xrb_uint128_to_dec (const xrb_uint128 source, char * destination); void xrb_uint128_to_dec (const xrb_uint128 source, char * destination);
@ -57,7 +57,7 @@ char * xrb_sign_transaction (const char * transaction, const xrb_uint256 private
// Generate work for 'transaction' // Generate work for 'transaction'
[[deprecated]] [[deprecated]]
char * xrb_work_transaction (const char * transaction); char * xrb_work_transaction (const char * transaction);
// clang-format on
#if __cplusplus #if __cplusplus
} // extern "C" } // extern "C"
#endif #endif

2
nano/node/node.cpp
View file

@ -2510,6 +2510,7 @@ public:
auto callback_l (callback); auto callback_l (callback);
std::weak_ptr<nano::node> node_w (node); std::weak_ptr<nano::node> node_w (node);
auto next_backoff (std::min (backoff * 2, (unsigned int)60 * 5)); auto next_backoff (std::min (backoff * 2, (unsigned int)60 * 5));
// clang-format off
node->alarm.add (now + std::chrono::seconds (backoff), [ node_w, root_l, callback_l, next_backoff, difficulty = difficulty ] { node->alarm.add (now + std::chrono::seconds (backoff), [ node_w, root_l, callback_l, next_backoff, difficulty = difficulty ] {
if (auto node_l = node_w.lock ()) if (auto node_l = node_w.lock ())
{ {
@ -2517,6 +2518,7 @@ public:
work_generation->start (); work_generation->start ();
} }
}); });
// clang-format on
} }
} }
} }