summaryrefslogtreecommitdiff
path: root/extra/yassl/mySTL
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-04-30 19:48:45 +0200
committerunknown <serg@serg.mylan>2005-04-30 19:48:45 +0200
commitd3d56609520700ce6f0490007cd4c01870bc7fd6 (patch)
tree74e86b2737e0e781445fade0c11a388a26d923e5 /extra/yassl/mySTL
parent927d747a21b7fe05a52074e511e75a600965c139 (diff)
downloadmariadb-git-d3d56609520700ce6f0490007cd4c01870bc7fd6.tar.gz
yassl changeset 2:
remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR don't set -DUSE_MYSYS_NEW for gcc 2.95 set $USE_MYSYS_NEW even if CXX is g++ yassl bugfixes instantiate all yassl templates explicitly client/Makefile.am: mysqlbinlog as a c++ program may need my_new.cc (if CXX=gcc) no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc client/mysqladmin.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc client/mysqlbinlog.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc configure.in: echo should be AC_MSG_WARN or AC_MSG_ERROR don't set -DUSE_MYSYS_NEW for gcc 2.95 (to restore old behaviour) set $USE_MYSYS_NEW even if CXX is g++ (for yassl, as it can be linked with C programs) remove -DDEFINE_CXA_PURE_VIRTUAL - -DUSE_MYSYS_NEW is enough extra/yassl/mySTL/list.hpp: bugfixes extra/yassl/src/Makefile.am: no need to mess with CXXFLAGS anymore. Instantiate all templates explicitly extra/yassl/src/crypto_wrapper.cpp: instantiate templates explicitly extra/yassl/src/yassl_imp.cpp: instantiate templates explicitly extra/yassl/src/yassl_int.cpp: instantiate templates explicitly extra/yassl/taocrypt/include/runtime.hpp: use -DUSE_MYSYS_NEW not -DDEFINE_CXA_PURE_VIRTUAL assert in __cxa_pure_virtual remove dummy (and thus dangerous) __cxa_guard_acquire/__cxa_guard_release extra/yassl/taocrypt/src/Makefile.am: no need to mess with CXXFLAGS anymore. Instantiate all templates explicitly extra/yassl/taocrypt/src/integer.cpp: instantiate templates explicitly extra/yassl/taocrypt/src/rsa.cpp: instantiate templates explicitly include/my_global.h: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc mysys/my_new.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc server-tools/instance-manager/command.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc sql/ha_blackhole.cc: typo fixed sql/ha_innodb.cc: warning fixed sql/item_func.cc: use LL() sql/mysqld.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
Diffstat (limited to 'extra/yassl/mySTL')
-rw-r--r--extra/yassl/mySTL/list.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/extra/yassl/mySTL/list.hpp b/extra/yassl/mySTL/list.hpp
index 223ae5a0fe4..5bbec6ab7c6 100644
--- a/extra/yassl/mySTL/list.hpp
+++ b/extra/yassl/mySTL/list.hpp
@@ -91,18 +91,18 @@ public:
{
iterator tmp = *this;
current_ = current_->next_;
- return tmp;
+ return *this;
}
iterator& operator--(int)
{
iterator tmp = *this;
current_ = current_->prev_;
- return tmp;
+ return *this;
}
bool operator==(const iterator& other) const
- {
+ {
return current_ == other.current_;
}
@@ -237,8 +237,8 @@ void list<T>::pop_back()
template<typename T>
T list<T>::back() const
{
- if (back == 0) return 0;
- return back->value_;
+ if (tail_ == 0) return 0;
+ return tail_->value_;
}