diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-01 14:53:32 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-01 14:53:32 +0100 |
| commit | 8fa6ce58605c8215084bbb4d9de490bbcf7fa670 (patch) | |
| tree | 33c5bed5605f87c9b98fa1a2b05c7fb3f1a63415 /extra/yassl/taocrypt | |
| parent | 245b9ad4b37bc08ecfe6aea748a3251db63e7236 (diff) | |
| parent | 793a137ddd737cd98d8d33efe54bcc218fd60c3f (diff) | |
| download | mariadb-git-8fa6ce58605c8215084bbb4d9de490bbcf7fa670.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
extra/comp_err.c:
Auto merged
include/my_pthread.h:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/mix2_myisam.result:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/tztime.cc:
Auto merged
client/mysqltest.c:
Manual merge
mysql-test/mysql-test-run.pl:
Manual merge
sql/mysqld.cc:
Manual merge
Diffstat (limited to 'extra/yassl/taocrypt')
| -rw-r--r-- | extra/yassl/taocrypt/mySTL/algorithm.hpp | 2 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/integer.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/extra/yassl/taocrypt/mySTL/algorithm.hpp b/extra/yassl/taocrypt/mySTL/algorithm.hpp index d8bc29a0bb9..f6a29cf4bdb 100644 --- a/extra/yassl/taocrypt/mySTL/algorithm.hpp +++ b/extra/yassl/taocrypt/mySTL/algorithm.hpp @@ -27,6 +27,8 @@ namespace mySTL { +#undef max +#undef min template<typename T> inline const T& max(const T& a, const T&b) diff --git a/extra/yassl/taocrypt/src/integer.cpp b/extra/yassl/taocrypt/src/integer.cpp index 419783403ea..84255aa8544 100644 --- a/extra/yassl/taocrypt/src/integer.cpp +++ b/extra/yassl/taocrypt/src/integer.cpp @@ -3390,7 +3390,7 @@ void Integer::DivideByPowerOf2(Integer &r, Integer &q, const Integer &a, CopyWords(r.reg_.get_buffer(), a.reg_.get_buffer(), wordCount); SetWords(r.reg_+wordCount, 0, r.reg_.size()-wordCount); if (n % WORD_BITS != 0) - r.reg_[wordCount-1] %= (1 << (n % WORD_BITS)); + r.reg_[wordCount-1] %= ((word) 1 << (n % WORD_BITS)); } else { |