bzr commit into mysql-5.1-telco-6.3-ndbjtie branch (martin.zaun:3112)

[Martin Zaun]

#At file:///Users/mz/mysql/ndb-6.3-ndbjtie-automake/ based on revid:martin.zaun@stripped

 3112 Martin Zaun	2009-11-10
      ndbjtie - minor warning fixes on Solaris.

    modified:
      storage/ndb/ndbjtie/jtie/include/jtie_gcalls.hpp
      storage/ndb/ndbjtie/jtie/test/myapi/myapi.hpp
=== modified file 'storage/ndb/ndbjtie/jtie/include/jtie_gcalls.hpp'
--- a/storage/ndb/ndbjtie/jtie/include/jtie_gcalls.hpp	2009-11-07 04:40:48 +0000
+++ b/storage/ndb/ndbjtie/jtie/include/jtie_gcalls.hpp	2009-11-11 06:26:33 +0000
@@ -463,7 +463,7 @@
 // ---------------------------------------------------------------------------
 
 // status flag declaration
-#define SFD int s; (void)s;
+#define SFD int s = 1; (void)s;
 
 #define PARAM_CONV_BEGIN(n)                                             \
     JAPT(n) jap##n = cast< JAPT(n), JFPT(n) >(jfp##n);                  \

=== modified file 'storage/ndb/ndbjtie/jtie/test/myapi/myapi.hpp'
--- a/storage/ndb/ndbjtie/jtie/test/myapi/myapi.hpp	2009-11-04 17:28:51 +0000
+++ b/storage/ndb/ndbjtie/jtie/test/myapi/myapi.hpp	2009-11-11 06:26:33 +0000
@@ -592,27 +592,27 @@ struct A {
 
     static A & return_null_ref() {
         TRACE("A & A::return_null_ref()");
-        return *((A *)NULL);
+        return *((A *)0);
     };
 
-    static void take_ptr(A * a) {
+    static void take_ptr(A * o) {
         TRACE("void A::take_ptr(A *)");
-        if (a != A::a) ABORT_ERROR("void A::take_ptr(A *)");
+        if (o != A::a) ABORT_ERROR("void A::take_ptr(A *)");
     };
 
-    static void take_null_ptr(A * a) {
+    static void take_null_ptr(A * o) {
         TRACE("void A::take_null_ptr(A *)");
-        if (a != NULL) ABORT_ERROR("void A::take_null_ptr(A *)");
+        if (o != NULL) ABORT_ERROR("void A::take_null_ptr(A *)");
     };
 
-    static void take_ref(A & a) {
+    static void take_ref(A & o) {
         TRACE("void A::take_ref(A &)");
-        if (&a != A::a) ABORT_ERROR("void A::take_ref(A &)");
+        if (&o != A::a) ABORT_ERROR("void A::take_ref(A &)");
     };
 
-    static void take_null_ref(A & a) {
+    static void take_null_ref(A & o) {
         TRACE("void A::take_null_ref(A &)");
-        if (&a != NULL) ABORT_ERROR("void A::take_null_ref(A &)");
+        if (&o != NULL) ABORT_ERROR("void A::take_null_ref(A &)");
     };
 
     static void print(A * p0) {
@@ -821,9 +821,9 @@ struct C0 {
         TRACE("C0()");
     }
 
-    C0(const C0 & c) {
+    C0(const C0 & o) {
         TRACE("C0(const C0 &)");
-        (void)c;
+        (void)o;
         ABORT_ERROR("!USE OF COPY CONSTRUCTOR!");
     }
 
@@ -831,9 +831,9 @@ struct C0 {
         TRACE("~C0()");
     }
 
-    C0 & operator=(const C0 & p) {
+    C0 & operator=(const C0 & o) {
         TRACE("C0 & operator=(const C0 &)");
-        (void)p;
+        (void)o;
         ABORT_ERROR("!USE OF ASSIGNMENT OPERATOR!");
         return *this;
     }
@@ -919,9 +919,9 @@ struct C1 : public C0 {
         TRACE("C1()");
     };
 
-    C1(const C1 & c) : C0(c) {
+    C1(const C1 & o) : C0(o) {
         TRACE("C1(const C1 &)");
-        (void)c;
+        (void)o;
         ABORT_ERROR("!USE OF COPY CONSTRUCTOR!");
     };
 


Attachment: [text/bzr-bundle] bzr/[e-mail]