e34a7e76b2
(Fix F24FTBFS)
29 lines
936 B
Diff
29 lines
936 B
Diff
From d95556cf14bc6dfc9601da8c099ba12899b34dbc Mon Sep 17 00:00:00 2001
|
|
From: Martin Vidner <mvidner@suse.cz>
|
|
Date: Fri, 29 Jan 2016 14:00:17 +0100
|
|
Subject: [PATCH] Fixed a compilation error in YTableCell with GCC 6
|
|
(bsc#964144).
|
|
|
|
It enables a previously inactive consistency check.
|
|
I have checked the known callers and they all seem to pass this check.
|
|
---
|
|
src/YTableItem.cc | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/YTableItem.cc b/src/YTableItem.cc
|
|
index 75923f1..40e7d4f 100644
|
|
--- a/src/YTableItem.cc
|
|
+++ b/src/YTableItem.cc
|
|
@@ -172,7 +172,7 @@ void YTableCell::reparent( YTableItem * parent, int column )
|
|
{
|
|
YUI_CHECK_PTR( parent );
|
|
|
|
- if ( _parent && _parent != parent && column != column )
|
|
+ if ( _parent && _parent != parent && _column != column )
|
|
YUI_THROW( YUIException( std::string( "Cannot reparent YTableCell \"" )
|
|
+ _label
|
|
+ "to different parent." ) );
|
|
--
|
|
2.5.0
|
|
|