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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166150 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1fd5338..39f5325 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
 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 bf3689b..fb999bf 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()
                 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
                 self.so = self.so + 1
                 if self.so >= self.isize:
                     self.item = self.item + 1