[SCM] archer-pmuldoon-pretty-printers-lookup: Add Tr1Iterator fix. Minor GNU style format change.

[SCM] archer-pmuldoon-pretty-printers-lookup: Add Tr1Iterator fix. Minor GNU style format change.

[pmuldoon]

The branch, archer-pmuldoon-pretty-printers-lookup has been updated
       via  d081eeae05a3acd47ec79fc92b45dff50180903a (commit)
      from  524b34dbf4255f42bb7606a4a94baa565d7bad3e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit d081eeae05a3acd47ec79fc92b45dff50180903a
Author: Phil Muldoon <pmuldoon@redhat.com>
Date:   Mon Feb 23 09:35:27 2009 +0000

    Add Tr1Iterator fix. Minor GNU style format change.

-----------------------------------------------------------------------

Summary of changes:
 gdb/python/lib/gdb/libstdcxx/v6/printers.py |   12 +++++++-----
 gdb/python/python.c                         |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

First 500 lines of diff:
diff --git a/gdb/python/lib/gdb/libstdcxx/v6/printers.py b/gdb/python/lib/gdb/libstdcxx/v6/printers.py
index b8c6d6f..701eec2 100644
--- a/gdb/python/lib/gdb/libstdcxx/v6/printers.py
+++ b/gdb/python/lib/gdb/libstdcxx/v6/printers.py
@@ -464,7 +464,7 @@ class StdStringPrinter:
 class Tr1HashtableIterator:
     def __init__ (self, hash):
         self.count = 0
-        self.n_buckets = hash['_M_bucket_count']
+        self.n_buckets = hash['_M_element_count']
         if self.n_buckets == 0:
             self.node = False
         else:
@@ -481,11 +481,13 @@ class Tr1HashtableIterator:
         while self.node == 0:
             self.bucket = self.bucket + 1
             self.node = self.bucket[0]
+
+       # If we advanced off the end of the bucket array, then
+       # we're done.
+        if self.count == self.n_buckets:
+            self.node = False
+        else:
             self.count = self.count + 1
-            # If we advanced off the end of the bucket array, then
-            # we're done.
-            if self.count == self.n_buckets:
-                self.node = False
 
     def next (self):
         if not self.node:
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 590ac88..3897132 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -866,7 +866,7 @@ search_pp_list (PyObject *list, PyObject *value)
       else if (printer != Py_None)
 	return printer;
 
-      Py_DECREF(Py_None);
+      Py_DECREF (Py_None);
     }
 
   Py_RETURN_NONE;


hooks/post-receive
--
Repository for Project Archer.