From 832b9f94bc77cc4fb51b56d07c751c79b74fc77e Mon Sep 17 00:00:00 2001 From: Sergey Abramchuk Date: Sat, 15 Apr 2017 14:16:13 +0300 Subject: [PATCH] Fix duplicate symbol issue --- OpenVPN Adapter/Vendors/openvpn/openvpn/common/hexstr.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenVPN Adapter/Vendors/openvpn/openvpn/common/hexstr.hpp b/OpenVPN Adapter/Vendors/openvpn/openvpn/common/hexstr.hpp index e0a2f41..caf2e4e 100644 --- a/OpenVPN Adapter/Vendors/openvpn/openvpn/common/hexstr.hpp +++ b/OpenVPN Adapter/Vendors/openvpn/openvpn/common/hexstr.hpp @@ -180,7 +180,7 @@ namespace openvpn { dest.push_back((high<<4) + low); } if (i != len) - throw parse_hex_error(); // straggler char + throw parse_hex_error(); // straggler char } // note -- currently doesn't detect overflow @@ -226,7 +226,7 @@ namespace openvpn { } template - std::string render_hex_number(T value, const bool caps=false) + inline std::string render_hex_number(T value, const bool caps=false) { unsigned char buf[sizeof(T)]; for (size_t i = sizeof(T); i --> 0 ;) @@ -237,7 +237,7 @@ namespace openvpn { return render_hex(buf, sizeof(T), caps); } - std::string render_hex_number(unsigned char uc, const bool caps=false) + inline std::string render_hex_number(unsigned char uc, const bool caps=false) { RenderHexByte b(uc, caps); return std::string(b.str2(), 2);