List:Commits« Previous MessageNext Message »
From:Guilhem Bichot Date:March 14 2011 1:50pm
Subject:bzr commit into mysql-trunk branch (guilhem.bichot:3277)
View as plain text  
#At file:///home/mysql_src/bzrrepos_new/mysql-next-mr-opt-backporting-wl4800/ based on revid:guilhem.bichot@stripped

 3277 Guilhem Bichot	2011-03-14
      fix for picky compiler (EE_OUTOFMEMORY is int, error is uint)

    modified:
      unittest/gunit/opt_trace-t.cc
=== modified file 'unittest/gunit/opt_trace-t.cc'
--- a/unittest/gunit/opt_trace-t.cc	2011-03-10 12:49:24 +0000
+++ b/unittest/gunit/opt_trace-t.cc	2011-03-14 13:50:34 +0000
@@ -91,8 +91,9 @@ protected:
   static bool oom; ///< whether we got an OOM error from opt trace
   static void my_error_handler(uint error, const char *str, myf MyFlags)
   {
-    EXPECT_EQ(EE_OUTOFMEMORY, error);
-    if (error == EE_OUTOFMEMORY)
+    const uint EE= static_cast<uint>(EE_OUTOFMEMORY);
+    EXPECT_EQ(EE, error);
+    if (error == EE)
       oom= true;
   }
 };


Attachment: [text/bzr-bundle] bzr/guilhem.bichot@oracle.com-20110314135034-ocht110vjdpowwb9.bundle
Thread
bzr commit into mysql-trunk branch (guilhem.bichot:3277) Guilhem Bichot14 Mar