From ce97fa87e773db809fca1441bd607345a7e30e48 Mon Sep 17 00:00:00 2001
From: Jeff Becker <ampernand@gmail.com>
Date: Mon, 29 Aug 2016 15:34:59 -0400
Subject: [PATCH] don't use std::promise *

---
 NetDb.cpp | 10 ++++------
 NetDb.h   |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/NetDb.cpp b/NetDb.cpp
index dca9900d..16bd8229 100644
--- a/NetDb.cpp
+++ b/NetDb.cpp
@@ -23,7 +23,7 @@ namespace data
 {		
 	NetDb netdb;
 
-	NetDb::NetDb (): m_Ready(new std::promise<void>()), m_IsRunning (false), m_Thread (nullptr), m_Reseeder (nullptr), m_Storage("netDb", "r", "routerInfo-", "dat"), m_HiddenMode(false)
+	NetDb::NetDb (): m_IsRunning (false), m_Thread (nullptr), m_Reseeder (nullptr), m_Storage("netDb", "r", "routerInfo-", "dat"), m_HiddenMode(false)
 	{
 	}
 	
@@ -34,7 +34,7 @@ namespace data
 	}	
 
 	void NetDb::Start ()
-	{	
+	{
 		m_Storage.SetPlace(i2p::fs::GetDataDir());
 		m_Storage.Init(i2p::data::GetBase64SubstitutionTable(), 64);
 		InitProfilesStorage ();
@@ -45,7 +45,7 @@ namespace data
 
 		m_IsRunning = true;
 		m_Thread = new std::thread (std::bind (&NetDb::Run, this));
-		m_Ready->set_value();
+		m_Ready.set_value();
 	}
 	
 	void NetDb::Stop ()
@@ -72,9 +72,7 @@ namespace data
 
   void NetDb::WaitForReady()
   {
-    m_Ready->get_future().wait();
-    delete m_Ready;
-    m_Ready = nullptr;
+    m_Ready.get_future().get();
   }
   
 	void NetDb::Run ()
diff --git a/NetDb.h b/NetDb.h
index 7cf2730e..324feb87 100644
--- a/NetDb.h
+++ b/NetDb.h
@@ -112,7 +112,7 @@ namespace data
         std::shared_ptr<const RouterInfo> GetRandomRouter (Filter filter) const;	
 		
 		private:
-			std::promise<void> * m_Ready;
+			std::promise<void> m_Ready;
 		
 			mutable std::mutex m_LeaseSetsMutex;
 			std::map<IdentHash, std::shared_ptr<LeaseSet> > m_LeaseSets;