Merge pull request #346 from network-intelligence/dev

hotfix: inlining functions to respect ODR
cisco · Dec 18, 2024 · d009a02 · d009a02
2 parents 9139040 + db478c4
commit d009a02
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/libmerc/base64.h b/src/libmerc/base64.h
@@ -9,7 +9,7 @@
 #include <cstring>
 #include <stdexcept>
 
-std::string hex_encode(const unsigned char *src, size_t len) {
+inline std::string hex_encode(const unsigned char *src, size_t len) {
     char hex_table[] =
         {
          '0', '1', '2', '3',
@@ -52,7 +52,7 @@ static const unsigned char base64url_table[65] =
 * @src: Data to be encoded
 * @len: Length of the data to be encoded
 */
-std::string base64_encode(const unsigned char *src, size_t len, const unsigned char table[65]=base64_table)
+inline std::string base64_encode(const unsigned char *src, size_t len, const unsigned char table[65]=base64_table)
 {
     unsigned char *out, *pos;
     const unsigned char *end, *in;