Changeset: 22d7d156220e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22d7d156220e
Modified Files:
monetdb5/optimizer/opt_groups.c
sql/backends/monet5/bam/bam_globals.c
Branch: Oct2014
Log Message:
Squash "remarks" from icc on Linux.
Unreachable code and missing newline.
diffs (47 lines):
diff --git a/monetdb5/optimizer/opt_groups.c b/monetdb5/optimizer/opt_groups.c
--- a/monetdb5/optimizer/opt_groups.c
+++ b/monetdb5/optimizer/opt_groups.c
@@ -23,6 +23,15 @@
int
OPTgroupsImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci)
{
+// Code should first be synchronized with mergetable
+// And a proper re-ordering test should proof its validity
+#if 1
+ (void) cntxt;
+ (void) mb;
+ (void) stk;
+ (void) pci;
+ return 0;
+#else
int i, j, actions=0;
InstrPtr q,p;
InstrPtr *old, *ref;
@@ -36,11 +45,6 @@ OPTgroupsImplementation(Client cntxt, Ma
return 0;
}
-// Code should first be synchronized with mergetable
-// And a proper re-ordering test should proof its validity
- if (1)
- return 0;
-
/* beware, new variables and instructions are introduced */
ref= (InstrPtr*) GDKzalloc(sizeof(InstrPtr) * mb->vtop); /* to find
last assignment */
if ( ref == NULL) {
@@ -124,4 +128,5 @@ OPTgroupsImplementation(Client cntxt, Ma
printFunction(cntxt->fdout,mb,0,LIST_MAL_STMT);
}
return actions;
+#endif
}
diff --git a/sql/backends/monet5/bam/bam_globals.c
b/sql/backends/monet5/bam/bam_globals.c
--- a/sql/backends/monet5/bam/bam_globals.c
+++ b/sql/backends/monet5/bam/bam_globals.c
@@ -48,4 +48,4 @@ bsopen(str filepath)
return NULL;
}
return wbs;
-}
\ No newline at end of file
+}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
