re PR libstdc++/45999 (runtime error in std::vector python pretty printer.)

2010-11-01  Jonathan Wakely  <jwakely.gcc@gmail.com>

	PR libstdc++/45999
	* python/libstdcxx/v6/printers.py (StdVectorPrinter): Replace
	conditional expression with backward-compatible if-else.

From-SVN: r166150

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1fd5338d210ea9e137b772909f30c12c0a61090e..39f53258e190a7131b007a7fc853e6a10c8f9537 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-01  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+       PR libstdc++/45999
+       * python/libstdcxx/v6/printers.py (StdVectorPrinter): Replace
+       conditional expression with backward-compatible if-else.
+
 2010-11-01  Jie Zhang  <jie@codesourcery.com>
 
        * config/abi/pre/gnu.ver: Export __emutls_v._ZSt11__once_call

diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index bf3689bb7076b6317f8125a5b56c84027d66bdbf..fb999bf5257b38dd61005a0c80bebe11250616dc 100644 (file)
--- a/libstdc++-v3/python/libstdcxx/v6/printers.py
+++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
@@ -177,7 +177,10 @@ class StdVectorPrinter:
                 if self.item == self.finish and self.so >= self.fo:
                     raise StopIteration
                 elt = self.item.dereference()
-                obit = 1 if elt & (1 << self.so) else 0
+                if elt & (1 << self.so):
+                    obit = 1
+                else:
+                    obit = 0
                 self.so = self.so + 1
                 if self.so >= self.isize:
                     self.item = self.item + 1