Changeset: d88d208736b4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d88d208736b4
Modified Files:
        pathfinder/compiler/algebra/algebra.c
Branch: Oct2010
Log Message:

avoid logical or with constant operand to fix compilation with clang 2.8 on 
64-bit Fedora 14:

pathfinder/compiler/algebra/algebra.c:958:50: error: use of logical || with 
constant operand; switch to bitwise | or remove constant 
[-Wconstant-logical-operand]
    switch (unq & (col_iter | col_pos | col_item || col_score)) {
                                                 ^  ~~~~~~~~~


diffs (12 lines):

diff -r 20ffa86c47f7 -r d88d208736b4 pathfinder/compiler/algebra/algebra.c
--- a/pathfinder/compiler/algebra/algebra.c     Tue Dec 07 19:36:42 2010 +0100
+++ b/pathfinder/compiler/algebra/algebra.c     Tue Dec 07 19:39:07 2010 +0100
@@ -955,7 +955,7 @@
 PFalg_col_t
 PFcol_ori_name (PFalg_col_t unq, PFalg_col_t free)
 {
-    switch (unq & (col_iter | col_pos | col_item || col_score)) {
+    switch (unq & (col_iter | col_pos | col_item | col_score)) {
         case col_iter:
             if (free & col_iter)   return col_iter;
             if (free & col_iter1)  return col_iter1;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to