From 37f7812a240e419c9aaf39a6069d113cfb45be0b Mon Sep 17 00:00:00 2001
From: Determinant <ted.sybil@gmail.com>
Date: Wed, 27 Mar 2019 15:06:29 -0400
Subject: add options

---
 include/hotstuff/hotstuff.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/hotstuff')

diff --git a/include/hotstuff/hotstuff.h b/include/hotstuff/hotstuff.h
index c4b87cf..f7acccc 100644
--- a/include/hotstuff/hotstuff.h
+++ b/include/hotstuff/hotstuff.h
@@ -204,7 +204,7 @@ class HotStuffBase: public HotStuffCore {
             pacemaker_bt pmaker,
             EventContext ec,
             size_t nworker,
-            const Net::Config &config);
+            const Net::Config &netconfig);
 
     ~HotStuffBase();
 
@@ -269,7 +269,7 @@ class HotStuff: public HotStuffBase {
             pacemaker_bt pmaker,
             EventContext ec = EventContext(),
             size_t nworker = 4,
-            const Net::Config &config = Net::Config()):
+            const Net::Config &netconfig = Net::Config()):
         HotStuffBase(blk_size,
                     rid,
                     new PrivKeyType(raw_privkey),
@@ -277,7 +277,7 @@ class HotStuff: public HotStuffBase {
                     std::move(pmaker),
                     ec,
                     nworker,
-                    config) {}
+                    netconfig) {}
 
     void add_replica(ReplicaID idx, const NetAddr &addr, const bytearray_t &pubkey_raw) {
         DataStream s(pubkey_raw);
-- 
cgit v1.2.3-70-g09d2