Adding explicit parenthesis to remove warnings

diff --git a/src/helper/units.cpp b/src/helper/units.cpp
index 3e632a0caf7530bfc86d857f39b04d7c7b669694..47c4746ac562c8a210d522cf1678d52da8e10be8 100644 (file)
--- a/src/helper/units.cpp
+++ b/src/helper/units.cpp
@@ -137,8 +137,8 @@ sp_convert_distance(gdouble *distance, SPUnit const *from, SPUnit const *to)
     if ((from->base == SP_UNIT_VOLATILE) || (to->base == SP_UNIT_VOLATILE)) return FALSE;
 
     if ((from->base == to->base)
-        || (from->base == SP_UNIT_DEVICE) && (to->base == SP_UNIT_ABSOLUTE)
-        || (from->base == SP_UNIT_ABSOLUTE) && (to->base == SP_UNIT_DEVICE))
+        || ((from->base == SP_UNIT_DEVICE) && (to->base == SP_UNIT_ABSOLUTE))
+        || ((from->base == SP_UNIT_ABSOLUTE) && (to->base == SP_UNIT_DEVICE)))
     {
         *distance = *distance * from->unittobase / to->unittobase;
         return TRUE;

diff --git a/src/widgets/layer-selector.cpp b/src/widgets/layer-selector.cpp
index 65f64fa4f16cb89d5b82e95c154a38661beb75e3..d51b31e67d27ccee81957a02f7d3b68a003d467a 100644 (file)
--- a/src/widgets/layer-selector.cpp
+++ b/src/widgets/layer-selector.cpp
@@ -539,7 +539,7 @@ void LayerSelector::_prepareLabelRenderer(
         SPObject *layer=( _desktop ? _desktop->currentLayer() : NULL );
         SPObject *root=( _desktop ? _desktop->currentRoot() : NULL );
 
-        bool isancestor = !( layer && SP_OBJECT_PARENT(object) == SP_OBJECT_PARENT(layer) || layer == root && SP_OBJECT_PARENT(object) == root);
+        bool isancestor = !( (layer && (SP_OBJECT_PARENT(object) == SP_OBJECT_PARENT(layer))) || ((layer == root) && (SP_OBJECT_PARENT(object) == root)));
 
         bool iscurrent = ( object == layer && object != root );
 

diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp
index 528902fef6505edc8609b29262f960465be0a5cf..0a2997437cbf538fbc1b3aaa85758600162eae89 100644 (file)
--- a/src/xml/repr-util.cpp
+++ b/src/xml/repr-util.cpp
@@ -416,8 +416,8 @@ sp_repr_lookup_child(Inkscape::XML::Node *repr,
     g_return_val_if_fail(repr != NULL, NULL);
     for ( Inkscape::XML::Node *child = repr->firstChild() ; child ; child = child->next() ) {
         gchar const *child_value = child->attribute(key);
-        if ( child_value == value ||
-             value && child_value && !strcmp(child_value, value) )
+        if ( (child_value == value) ||
+             (value && child_value && !strcmp(child_value, value)) )
         {
             return child;
         }