From 04d29d92aec27c238077253aafd690842776f0fd Mon Sep 17 00:00:00 2001
From: Nemanja Trifunovic <ntrifunovic@hotmail.com>
Date: Mon, 15 Apr 2019 17:49:11 -0400
Subject: [PATCH] Add inline declarations to non-template functions in cpp11.h

Fix for issue #31
---
 source/utf8/cpp11.h             | 20 ++++++++++----------
 tests/test_checked_api.cpp      |  2 +-
 tests/test_checked_iterator.cpp |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/source/utf8/cpp11.h b/source/utf8/cpp11.h
index c8a8803..d93961b 100644
--- a/source/utf8/cpp11.h
+++ b/source/utf8/cpp11.h
@@ -34,65 +34,65 @@ DEALINGS IN THE SOFTWARE.
 namespace utf8
 {
 
-    void append(char32_t cp, std::string& s)
+    inline void append(char32_t cp, std::string& s)
     {
         append(uint32_t(cp), std::back_inserter(s));
     }
 
-    std::string utf16to8(const std::u16string& s)
+    inline std::string utf16to8(const std::u16string& s)
     {
         std::string result;
         utf16to8(s.begin(), s.end(), std::back_inserter(result));
         return result;
     }
 
-    std::u16string utf8to16(const std::string& s)
+    inline std::u16string utf8to16(const std::string& s)
     {
         std::u16string result;
         utf8to16(s.begin(), s.end(), std::back_inserter(result));
         return result;
     }
 
-    std::string utf32to8(const std::u32string& s)
+    inline std::string utf32to8(const std::u32string& s)
     {
         std::string result;
         utf32to8(s.begin(), s.end(), std::back_inserter(result));
         return result;
     }
 
-    std::u32string utf8to32(const std::string& s)
+    inline std::u32string utf8to32(const std::string& s)
     {
         std::u32string result;
         utf8to32(s.begin(), s.end(), std::back_inserter(result));
         return result;
     }
 
-    std::size_t find_invalid(const std::string& s)
+    inline std::size_t find_invalid(const std::string& s)
     {
         std::string::const_iterator invalid = find_invalid(s.begin(), s.end());
         return (invalid == s.end()) ? std::string::npos : (invalid - s.begin());
     }
 
-    bool is_valid(const std::string& s)
+    inline bool is_valid(const std::string& s)
     {
         return is_valid(s.begin(), s.end());
     }
 
-    std::string replace_invalid(const std::string& s, char32_t replacement)
+    inline std::string replace_invalid(const std::string& s, char32_t replacement)
     {
         std::string result;
         replace_invalid(s.begin(), s.end(), std::back_inserter(result), replacement);
         return result;
     }
 
-    std::string replace_invalid(const std::string& s)
+    inline std::string replace_invalid(const std::string& s)
     {
         std::string result;
         replace_invalid(s.begin(), s.end(), std::back_inserter(result));
         return result;
     }
 
-    bool starts_with_bom(const std::string& s)
+    inline bool starts_with_bom(const std::string& s)
     {
         return starts_with_bom(s.begin(), s.end());
     }
diff --git a/tests/test_checked_api.cpp b/tests/test_checked_api.cpp
index c378815..6787da6 100644
--- a/tests/test_checked_api.cpp
+++ b/tests/test_checked_api.cpp
@@ -1,5 +1,5 @@
 #include "gtest/gtest.h"
-#include "utf8/checked.h"
+#include "utf8.h"
 
 #include <string>
 #include <vector>
diff --git a/tests/test_checked_iterator.cpp b/tests/test_checked_iterator.cpp
index 21c39b1..4c44834 100644
--- a/tests/test_checked_iterator.cpp
+++ b/tests/test_checked_iterator.cpp
@@ -1,5 +1,5 @@
 #include "gtest/gtest.h"
-#include "utf8/checked.h"
+#include "utf8.h"
 
 using namespace utf8;