bk commit into 5.0 tree (konstantin:1.1924)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1924 05/06/06 15:52:45 konstantin@stripped +1 -0
  Portability fix, mySTL on Sun Forte 5.4.

  extra/yassl/mySTL/memory.hpp
    1.3 05/06/06 15:52:40 konstantin@stripped +4 -2
    Portability fix, mySTL on Sun Forte 5.4: default template arguments that
    are based on previous template argument don't work, just remove
    the fancy syntax (non-default second argument is not used anywhere
    anyway).

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-root

--- 1.2/extra/yassl/mySTL/memory.hpp	2005-05-31 19:56:24 +04:00
+++ 1.3/extra/yassl/mySTL/memory.hpp	2005-06-06 15:52:40 +04:00
@@ -37,16 +37,18 @@
 namespace mySTL {
 
 
-template<typename T, typename Deletor = void (*) (T*)>
+template<typename T>
 struct auto_ptr_ref {
+    typedef void (*Deletor)(T*);
     T*      ptr_;
     Deletor del_;
     auto_ptr_ref(T* p, Deletor d) : ptr_(p), del_(d) {}
 };
 
 
-template<typename T, typename Deletor = void (*) (T*)>
+template<typename T>
 class auto_ptr {
+    typedef void (*Deletor)(T*);
     T*       ptr_;
     Deletor  del_;