summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-09-27 16:45:44 +0200
committerunknown <msvensson@neptunus.(none)>2006-09-27 16:45:44 +0200
commita714c2cfb36d22eecb906cf79f3c59c278b6cf6c (patch)
treeb0a1b0921bd58624a1626c4a4839a6e72d8380d3 /extra
parent8d4ad17217e9e4c16cb3c0ac02f1ff9d2a6fa908 (diff)
downloadmariadb-git-a714c2cfb36d22eecb906cf79f3c59c278b6cf6c.tar.gz
Fix compile failure on Sun C++ 5.7 in yaSSL code
- Trying to use unctions declared as static being used from another file, change them to be inline extra/yassl/taocrypt/mySTL/helpers.hpp: Change 'GetMemory' and 'FreeMemory' function te be inline instead of static.
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/taocrypt/mySTL/helpers.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/yassl/taocrypt/mySTL/helpers.hpp b/extra/yassl/taocrypt/mySTL/helpers.hpp
index 3332ac97ace..43381c0f6ea 100644
--- a/extra/yassl/taocrypt/mySTL/helpers.hpp
+++ b/extra/yassl/taocrypt/mySTL/helpers.hpp
@@ -142,13 +142,13 @@ void FreeArrayMemory(T* ptr)
-static void* GetMemory(size_t bytes)
+inline void* GetMemory(size_t bytes)
{
return GetArrayMemory<unsigned char>(bytes);
}
-static void FreeMemory(void* ptr)
+inline void FreeMemory(void* ptr)
{
FreeArrayMemory(ptr);
}