diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-09-27 16:47:59 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-09-27 16:47:59 +0200 |
| commit | 4afea2482e788fbf8d0574abfee7ce9ca7474211 (patch) | |
| tree | 909f012c59f8d0b778867f25eab825c61c7d6c34 /extra | |
| parent | fa97f0faa1f2f9dc1825221da642e0d9fbc93d25 (diff) | |
| parent | a714c2cfb36d22eecb906cf79f3c59c278b6cf6c (diff) | |
| download | mariadb-git-4afea2482e788fbf8d0574abfee7ce9ca7474211.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
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); } |