Commit 74693a28 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0
parents 115d3410 f0f9b595

extra/yassl/include/yassl_int.hpp

+4 −2
Original line number Diff line number Diff line
@@ -122,7 +122,8 @@ public: 


    friend sslFactory& GetSSL_Factory();        // singleton creator

private:

    static sslFactory instance;

    static sslFactory instance_;



    sslFactory(const sslFactory&);              // hide copy

    sslFactory& operator=(const sslFactory&);   // and assign   

};
@@ -207,9 +208,10 @@ public: 


    friend Sessions& GetSessions(); // singleton creator

private:

    static Sessions instance_;



    Sessions(const Sessions&);              // hide copy

    Sessions& operator=(const Sessions&);   // and assign

    static Sessions instance;

};

extra/yassl/src/log.cpp

+3 −3
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ 
#include "log.hpp"



#ifdef YASSL_LOG

    #include <ctime>

    #include <cstdio>

    #include <cstring>

    #include <time.h>

    #include <stdio.h>

    #include <string.h>

#endif

extra/yassl/src/yassl_int.cpp

+5 −4
Original line number Diff line number Diff line
@@ -1324,18 +1324,19 @@ SSL_SESSION::~SSL_SESSION() 
}





Sessions Sessions::instance; // simple singleton

Sessions Sessions::instance_; // simple singleton



Sessions& GetSessions()

{

    return Sessions::instance;

    return Sessions::instance_;

}



sslFactory sslFactory::instance;



sslFactory sslFactory::instance_; // simple singleton



sslFactory& GetSSL_Factory()

{   

    return sslFactory::instance;

    return sslFactory::instance_;

}

extra/yassl/taocrypt/include/integer.hpp

+1 −1
Original line number Diff line number Diff line
@@ -251,11 +251,11 @@ public: 
private:

    friend class ModularArithmetic;

    friend class MontgomeryRepresentation;

    Integer(word value, unsigned int length);



    static const Integer zero;

    static const Integer one;

    static const Integer two;

    Integer(word value, unsigned int length);

    int PositiveCompare(const Integer& t) const;



    friend void PositiveAdd(Integer& sum, const Integer& a, const Integer& b);

extra/yassl/taocrypt/src/integer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -3948,6 +3948,9 @@ Integer CRT(const Integer &xp, const Integer &p, const Integer &xq, 


#ifdef __GNUC__

template unsigned int DivideThreeWordsByTwo<unsigned int, DWord>(unsigned int*, unsigned int, unsigned int, DWord*);

#if defined(SSE2_INTRINSICS_AVAILABLE)

template AlignedAllocator<unsigned int>::pointer StdReallocate<unsigned int, AlignedAllocator<unsigned int> >(AlignedAllocator<unsigned int>&, unsigned int*, AlignedAllocator<unsigned int>::size_type, AlignedAllocator<unsigned int>::size_type, bool);

#endif

#endif



} // namespace