bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:2940) Bug#44248

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@strippeda2o1bhsf2e

 2940 Magnus Blåudd	2009-06-04
      Bug #44248  	Identifying nodes waited for from cluster log requires mental gymnastics.
       - compilation fixes

    modified:
      storage/ndb/include/util/Bitmask.hpp
      storage/ndb/src/common/util/Bitmask.cpp
=== modified file 'storage/ndb/include/util/Bitmask.hpp'
--- a/storage/ndb/include/util/Bitmask.hpp	2009-06-03 18:19:28 +0000
+++ b/storage/ndb/include/util/Bitmask.hpp	2009-06-04 10:26:02 +0000
@@ -449,6 +449,8 @@ BitmaskImpl::getText(unsigned size, cons
   return org;
 }
 
+class BaseString;
+
 /**
  * Bitmasks.  The size is number of 32-bit words (Uint32).
  * Unused bits in the last word must be zero.
@@ -508,9 +510,9 @@ public:
    *
    * getPrettyText is based on nodes2str() in ConfigManager.cpp()
    */
-  class BaseString getText();
-  class BaseString getPrettyText();
-  class BaseString getPrettyTextShort();
+  BaseString getText();
+  BaseString getPrettyText();
+  BaseString getPrettyTextShort();
 
   /**
    * start of static members

=== modified file 'storage/ndb/src/common/util/Bitmask.cpp'
--- a/storage/ndb/src/common/util/Bitmask.cpp	2009-06-03 18:19:28 +0000
+++ b/storage/ndb/src/common/util/Bitmask.cpp	2009-06-04 10:26:02 +0000
@@ -178,14 +178,14 @@ BitmaskImpl::parseMask(unsigned size, Ui
 }
 
 template <unsigned size>
-class BaseString BitmaskPOD<size>::getText()
+BaseString BitmaskPOD<size>::getText()
 {
   char buf[32*size+1];
   return BitmaskImpl::getText(size, rep.data, buf);
 }
 
 template <unsigned size>
-class BaseString BitmaskPOD<size>::getPrettyText()
+BaseString BitmaskPOD<size>::getPrettyText()
 {
   const char* delimiter = "";
   unsigned i, found = 0, MAX_BITS = 8 * size;
@@ -206,7 +206,7 @@ class BaseString BitmaskPOD<size>::getPr
 }
 
 template <unsigned size>
-class BaseString BitmaskPOD<size>::getPrettyTextShort()
+BaseString BitmaskPOD<size>::getPrettyTextShort()
 {
   const char* delimiter = "";
   unsigned i, MAX_BITS = 8 * size;

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