diff options
| author | konstantin@mysql.com <> | 2005-05-20 22:52:41 +0400 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2005-05-20 22:52:41 +0400 |
| commit | b6c93da24c25ff57abd4d818c523a7b5a15147d9 (patch) | |
| tree | 412960270abf2f54404504d130b3c855ff818a48 /extra | |
| parent | 5ce823ec289b6533af40433bf442f1567a44bf6f (diff) | |
| download | mariadb-git-b6c93da24c25ff57abd4d818c523a7b5a15147d9.tar.gz | |
yaSSL fixes for Sun Forte 7
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/include/yassl_types.hpp | 2 | ||||
| -rw-r--r-- | extra/yassl/mySTL/helpers.hpp | 4 | ||||
| -rw-r--r-- | extra/yassl/mySTL/list.hpp | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/extra/yassl/include/yassl_types.hpp b/extra/yassl/include/yassl_types.hpp index 6359ad54aab..1ad4998bade 100644 --- a/extra/yassl/include/yassl_types.hpp +++ b/extra/yassl/include/yassl_types.hpp @@ -27,7 +27,7 @@ #ifndef yaSSL_TYPES_HPP #define yaSSL_TYPES_HPP -#include<cstddef> +#include <stddef.h> namespace yaSSL { diff --git a/extra/yassl/mySTL/helpers.hpp b/extra/yassl/mySTL/helpers.hpp index fdb856d4db1..779389e322a 100644 --- a/extra/yassl/mySTL/helpers.hpp +++ b/extra/yassl/mySTL/helpers.hpp @@ -32,8 +32,8 @@ #ifdef __IBMCPP__ /* - Workaround the lack of operator new(size_t, void*) - in IBM VA CPP 6.0 + Workaround for the lack of operator new(size_t, void*) + in IBM VA C++ 6.0 */ struct Dummy {}; inline void *operator new(size_t size, Dummy *d) { return (void*) d; } diff --git a/extra/yassl/mySTL/list.hpp b/extra/yassl/mySTL/list.hpp index 5bbec6ab7c6..be149b1a984 100644 --- a/extra/yassl/mySTL/list.hpp +++ b/extra/yassl/mySTL/list.hpp @@ -38,6 +38,13 @@ namespace mySTL { template<typename T> class list { +#ifdef __SUNPRO_CC +/* + Sun Forte 7 C++ v. 5.4 needs class 'node' be public to be visible to + the nested class 'iterator' (a non-standard behaviour). +*/ +public: +#endif struct node { node(T t) : prev_(0), next_(0), value_(t) {} |