summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-01-11 20:26:57 +0100
committermadmaxoft <github@xoft.cz>2014-01-11 20:27:07 +0100
commit7fa5217aad5426247d4a6cfd518e241d15c6f44e (patch)
tree7005bf09b5f621ccff17f0c42fddff0c32049c74
parentMerge pull request #530 from mc-server/GeneratorDecouple (diff)
downloadcuberite-7fa5217aad5426247d4a6cfd518e241d15c6f44e.tar
cuberite-7fa5217aad5426247d4a6cfd518e241d15c6f44e.tar.gz
cuberite-7fa5217aad5426247d4a6cfd518e241d15c6f44e.tar.bz2
cuberite-7fa5217aad5426247d4a6cfd518e241d15c6f44e.tar.lz
cuberite-7fa5217aad5426247d4a6cfd518e241d15c6f44e.tar.xz
cuberite-7fa5217aad5426247d4a6cfd518e241d15c6f44e.tar.zst
cuberite-7fa5217aad5426247d4a6cfd518e241d15c6f44e.zip
-rw-r--r--lib/cryptopp/misc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cryptopp/misc.h b/lib/cryptopp/misc.h
index 2b326dd60..9149b9ac0 100644
--- a/lib/cryptopp/misc.h
+++ b/lib/cryptopp/misc.h
@@ -545,7 +545,7 @@ inline void SecureWipeArray(T *buf, size_t n)
}
// this function uses wcstombs(), which assumes that setlocale() has been called
-static std::string StringNarrow(const wchar_t *str, bool throwOnError = true)
+inline std::string StringNarrow(const wchar_t *str, bool throwOnError = true)
{
#ifdef _MSC_VER
#pragma warning(push)