From c4ea52a9db2945d724013af428e8fe32ee9b683a Mon Sep 17 00:00:00 2001
From: Dennis Brentjes <d.brentjes@gmail.com>
Date: Thu, 15 Dec 2016 12:43:51 +0100
Subject: "Nicer" solution to the private typedef problem.

Gcc doesn't even error on the private typedef access. So instead of
entering and exiting the public scope in the class definition, Just
add a template which forces deduction of the underlying type.
---
 node/node.hpp      | 2 --
 node/node_node.cpp | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/node/node.hpp b/node/node.hpp
index de4e25d..d9e16d4 100644
--- a/node/node.hpp
+++ b/node/node.hpp
@@ -92,9 +92,7 @@ class Node
 	
 	typedef std::map<std::string, SSLSenderReceiver> ClientConnections;
 	ClientConnections clients;
-public:
 	typedef std::map<std::string, CMixClientData> ClientData;
-private:
 	ClientData data;
 	typedef std::map<std::string, std::queue<std::string>> ClientMessages;
 	ClientMessages messages;
diff --git a/node/node_node.cpp b/node/node_node.cpp
index 56e883d..db1be1f 100644
--- a/node/node_node.cpp
+++ b/node/node_node.cpp
@@ -125,8 +125,8 @@ void fill_commitments_message(CMixContext& ctx, cmix_proto::Commitments& commits
 	commits.set_ciphertext_commitment(commitment.data(), commitment.size());
 }
 
-template <typename T>
-void fill_realtime_pre_message(CMixContext& ctx, cmix_proto::RealPre& realpre, T const& hs, T const& ms, Node::ClientData const& data) {
+template <typename T, typename U>
+void fill_realtime_pre_message(CMixContext& ctx, cmix_proto::RealPre& realpre, T const& hs, T const& ms, U const& data) {
 	size_t len = get_group_element_array_size(&ctx);
 	
 	std::vector<char*> msv1(ms.size(), nullptr);
-- 
cgit v1.2.3-70-g09d2