From 7e8af58307b4e07dee2144e5327e2ae8ed185b0c Mon Sep 17 00:00:00 2001
From: Damian Jarek <damian.jarek93@gmail.com>
Date: Mon, 24 Jun 2019 14:41:36 +0200
Subject: [PATCH] Move detail::base64 helpers to tests

These functions were only used in tests.

Signed-off-by: Damian Jarek <damian.jarek93@gmail.com>
---
 CHANGELOG.md                               |  1 +
 include/boost/beast/core/detail/base64.hpp | 21 ---------------
 include/boost/beast/core/detail/base64.ipp | 18 -------------
 test/beast/core/_detail_base64.cpp         | 30 ++++++++++++++++++++++
 4 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df47460f..fbdcee1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Version 260:
 * More split compilation in websocket/detail/mask.hpp
 * Cleanup transitive includes in beast/core/detail/type_traits.hpp
 * Simplify generation of sec-websocket-key
+* Move detail::base64 helpers to tests
 
 --------------------------------------------------------------------------------
 
diff --git a/include/boost/beast/core/detail/base64.hpp b/include/boost/beast/core/detail/base64.hpp
index 7f91c047..477fecf2 100644
--- a/include/boost/beast/core/detail/base64.hpp
+++ b/include/boost/beast/core/detail/base64.hpp
@@ -12,7 +12,6 @@
 
 #include <boost/beast/core/string.hpp>
 #include <cctype>
-#include <string>
 #include <utility>
 
 namespace boost {
@@ -78,26 +77,6 @@ decode(void* dest, char const* src, std::size_t len);
 
 } // base64
 
-BOOST_BEAST_DECL
-std::string
-base64_encode(std::uint8_t const* data, std::size_t len);
-
-BOOST_BEAST_DECL
-std::string
-base64_encode(string_view s);
-
-template<class = void>
-std::string
-base64_decode(string_view data)
-{
-    std::string dest;
-    dest.resize(base64::decoded_size(data.size()));
-    auto const result = base64::decode(
-        &dest[0], data.data(), data.size());
-    dest.resize(result.first);
-    return dest;
-}
-
 } // detail
 } // beast
 } // boost
diff --git a/include/boost/beast/core/detail/base64.ipp b/include/boost/beast/core/detail/base64.ipp
index 7e11d188..4fc3c677 100644
--- a/include/boost/beast/core/detail/base64.ipp
+++ b/include/boost/beast/core/detail/base64.ipp
@@ -195,24 +195,6 @@ decode(void* dest, char const* src, std::size_t len)
 
 } // base64
 
-std::string
-base64_encode(
-    std::uint8_t const* data,
-    std::size_t len)
-{
-    std::string dest;
-    dest.resize(base64::encoded_size(len));
-    dest.resize(base64::encode(&dest[0], data, len));
-    return dest;
-}
-
-std::string
-base64_encode(string_view s)
-{
-    return base64_encode (reinterpret_cast <
-        std::uint8_t const*> (s.data()), s.size());
-}
-
 } // detail
 } // beast
 } // boost
diff --git a/test/beast/core/_detail_base64.cpp b/test/beast/core/_detail_base64.cpp
index 5f50c213..c4c06f24 100644
--- a/test/beast/core/_detail_base64.cpp
+++ b/test/beast/core/_detail_base64.cpp
@@ -11,6 +11,7 @@
 #include <boost/beast/core/detail/base64.hpp>
 
 #include <boost/beast/_experimental/unit_test/suite.hpp>
+#include <string>
 
 namespace boost {
 namespace beast {
@@ -19,6 +20,35 @@ namespace detail {
 class base64_test : public beast::unit_test::suite
 {
 public:
+    std::string
+    base64_encode(
+        std::uint8_t const* data,
+        std::size_t len)
+    {
+        std::string dest;
+        dest.resize(base64::encoded_size(len));
+        dest.resize(base64::encode(&dest[0], data, len));
+        return dest;
+    }
+
+    std::string
+    base64_encode(string_view s)
+    {
+        return base64_encode (reinterpret_cast <
+            std::uint8_t const*> (s.data()), s.size());
+    }
+
+    std::string
+    base64_decode(string_view data)
+    {
+        std::string dest;
+        dest.resize(base64::decoded_size(data.size()));
+        auto const result = base64::decode(
+            &dest[0], data.data(), data.size());
+        dest.resize(result.first);
+        return dest;
+    }
+
     void
     check (std::string const& in, std::string const& out)
     {