bzr commit into mysql-5.5 branch (davi:3433)

[Davi Arnaut]

# At a local mysql-5.5 repository of davi

 3433 Davi Arnaut	2011-04-11
      Move I_P_List_adapter to sql_plist.h as it is currently being used
      for code other then in mdl.h. Since the adapter is generic, it is
      better located in sql_plist.h.

    modified:
      sql/mdl.h
      sql/sql_plist.h
=== modified file 'sql/mdl.h'
--- a/sql/mdl.h	2010-11-22 10:50:20 +0000
+++ b/sql/mdl.h	2011-04-11 11:39:15 +0000
@@ -286,21 +286,6 @@ private:
 };
 
 
-
-/**
-  Hook class which via its methods specifies which members
-  of T should be used for participating in MDL lists.
-*/
-
-template <typename T, T* T::*next, T** T::*prev>
-struct I_P_List_adapter
-{
-  static inline T **next_ptr(T *el) { return &(el->*next); }
-
-  static inline T ***prev_ptr(T *el) { return &(el->*prev); }
-};
-
-
 /**
   A pending metadata lock request.
 

=== modified file 'sql/sql_plist.h'
--- a/sql/sql_plist.h	2010-06-07 13:40:52 +0000
+++ b/sql/sql_plist.h	2011-04-11 11:39:15 +0000
@@ -188,6 +188,20 @@ public:
 
 
 /**
+  Hook class which via its methods specifies which members
+  of T should be used for participating in a intrusive list.
+*/
+
+template <typename T, T* T::*next, T** T::*prev>
+struct I_P_List_adapter
+{
+  static inline T **next_ptr(T *el) { return &(el->*next); }
+
+  static inline T ***prev_ptr(T *el) { return &(el->*prev); }
+};
+
+
+/**
   Element counting policy class for I_P_List to be used in
   cases when no element counting should be done.
 */


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