bk commit into 5.0 tree (konstantin:1.1937)

[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.1937 05/06/15 00:48:02 konstantin@stripped +2 -0
  gcc 2.96 fixes (workarounds for compiler bugs in namespace handling)

  extra/yassl/include/yassl_types.hpp
    1.7 05/06/15 00:47:56 konstantin@stripped +10 -1
    gcc 2.96 fixes

  extra/yassl/include/yassl_int.hpp
    1.6 05/06/15 00:47:56 konstantin@stripped +6 -1
    gcc 2.96 fixes

# 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.5/extra/yassl/include/yassl_int.hpp	2005-06-10 19:09:35 +04:00
+++ 1.6/extra/yassl/include/yassl_int.hpp	2005-06-15 00:47:56 +04:00
@@ -164,7 +164,12 @@
 
 // openSSL bignum
 struct BIGNUM {
-    Integer int_;
+    /*
+      gcc 2.96 fix: because of two Integer classes (yaSSL::Integer and
+      TaoCrypt::Integer), we need to explicitly state the namespace
+      here to let gcc 2.96 deduce the correct type.
+    */
+    yaSSL::Integer int_;
     void assign(const byte* b, uint s) { int_.assign(b,s); }
 };
 

--- 1.6/extra/yassl/include/yassl_types.hpp	2005-06-10 19:09:35 +04:00
+++ 1.7/extra/yassl/include/yassl_types.hpp	2005-06-15 00:47:56 +04:00
@@ -445,6 +445,15 @@
 const opaque key_label   [KEY_LABEL_SZ + 1]    = "key expansion";
 
 
-} // naemspace
+} // namespace
+
+#if __GNUC__ == 2 && __GNUC_MINOR__ <= 96
+/*
+  gcc 2.96 bails out because of two declarations of byte: yaSSL::byte and
+  TaoCrypt::byte. TODO: define global types.hpp and move the declaration of
+  'byte' there.
+*/
+using yaSSL::byte;
+#endif
 
 #endif // yaSSL_TYPES_HPP