diff options
| author | msvensson@neptunus.(none) <> | 2006-09-27 16:46:38 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-09-27 16:46:38 +0200 |
| commit | d1f7bc0971c54e780faf4b3cb4d45169e151b1a4 (patch) | |
| tree | c45242260f0fa6607a16c662767b44efe8a0eb12 /extra | |
| parent | 980268df03c23f03de32253276f5a15b7aff70a3 (diff) | |
| parent | ca0b8c552ab81c77a37b046ce60fe3610e584d39 (diff) | |
| download | mariadb-git-d1f7bc0971c54e780faf4b3cb4d45169e151b1a4.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/mySTL/helpers.hpp | 4 |
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); } |