summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-09-13 18:01:27 +0200
committerunknown <msvensson@neptunus.(none)>2005-09-13 18:01:27 +0200
commit8962950313608aba2442f826730ac6c0ec31aca8 (patch)
tree1716c131a4cb5722e182d52bae0802fc2d4c56bf /extra
parent99a2aa2d7d897e8cff32f1d4b6efe71412d024e8 (diff)
parent1485e9236c849008b459f407f9bdfe78bc0b13ff (diff)
downloadmariadb-git-8962950313608aba2442f826730ac6c0ec31aca8.tar.gz
Merge bk-internal:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/taocrypt/src/integer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/yassl/taocrypt/src/integer.cpp b/extra/yassl/taocrypt/src/integer.cpp
index 71324b04b92..01bd5b2ec94 100644
--- a/extra/yassl/taocrypt/src/integer.cpp
+++ b/extra/yassl/taocrypt/src/integer.cpp
@@ -568,13 +568,13 @@ public:
static word Add(word *C, const word *A, const word *B, unsigned int N);
static word Subtract(word *C, const word *A, const word*B, unsigned int N);
- static inline void Multiply2(word *C, const word *A, const word *B);
- static inline word Multiply2Add(word *C, const word *A, const word *B);
+ static void Multiply2(word *C, const word *A, const word *B);
+ static word Multiply2Add(word *C, const word *A, const word *B);
static void Multiply4(word *C, const word *A, const word *B);
static void Multiply8(word *C, const word *A, const word *B);
static inline unsigned int MultiplyRecursionLimit() {return 8;}
- static inline void Multiply2Bottom(word *C, const word *A, const word *B);
+ static void Multiply2Bottom(word *C, const word *A, const word *B);
static void Multiply4Bottom(word *C, const word *A, const word *B);
static void Multiply8Bottom(word *C, const word *A, const word *B);
static inline unsigned int MultiplyBottomRecursionLimit() {return 8;}
@@ -668,7 +668,7 @@ void Portable::Multiply2(word *C, const word *A, const word *B)
C[3] = t.GetHighHalf();
}
-inline void Portable::Multiply2Bottom(word *C, const word *A, const word *B)
+void Portable::Multiply2Bottom(word *C, const word *A, const word *B)
{
DWord t = DWord::Multiply(A[0], B[0]);
C[0] = t.GetLowHalf();