Changeset: 871343342ec9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=871343342ec9
Modified Files:
sql/storage/bat/bat_table.c
sql/storage/restrict/restrict_table.c
sql/storage/sql_storage.h
Branch: Jan2014
Log Message:
Remove __attribute__((__sentinel__)): clang doesn't like it.
You can have it as function attribute, but not on typedef defining a
function type.
diffs (39 lines):
diff --git a/sql/storage/bat/bat_table.c b/sql/storage/bat/bat_table.c
--- a/sql/storage/bat/bat_table.c
+++ b/sql/storage/bat/bat_table.c
@@ -98,8 +98,7 @@ full_column(sql_trans *tr, sql_column *c
return delta_full_bat(c, c->data, isTemp(c), d, s);
}
-static oid column_find_row(sql_trans *tr, sql_column *c, void *value, ...)
- __attribute__((__sentinel__));
+static oid column_find_row(sql_trans *tr, sql_column *c, void *value, ...);
static oid
column_find_row(sql_trans *tr, sql_column *c, void *value, ...)
{
diff --git a/sql/storage/restrict/restrict_table.c
b/sql/storage/restrict/restrict_table.c
--- a/sql/storage/restrict/restrict_table.c
+++ b/sql/storage/restrict/restrict_table.c
@@ -51,8 +51,7 @@ full_column(sql_column *c, BAT *d, BAT *
return full_column_( c, d, s);
}
-static oid column_find_row(sql_trans *tr, sql_column *c, void *value, ...)
- __attribute__((__sentinel__));
+static oid column_find_row(sql_trans *tr, sql_column *c, void *value, ...);
static oid
column_find_row(sql_trans *tr, sql_column *c, void *value, ...)
{
diff --git a/sql/storage/sql_storage.h b/sql/storage/sql_storage.h
--- a/sql/storage/sql_storage.h
+++ b/sql/storage/sql_storage.h
@@ -51,8 +51,7 @@ extern int store_readonly;
extern int store_singleuser;
/* relational interface */
-typedef oid (*column_find_row_fptr)(sql_trans *tr, sql_column *c, void *value,
...)
- __attribute__((__sentinel__));
+typedef oid (*column_find_row_fptr)(sql_trans *tr, sql_column *c, void *value,
...);
typedef void *(*column_find_value_fptr)(sql_trans *tr, sql_column *c, oid rid);
typedef int (*column_update_value_fptr)(sql_trans *tr, sql_column *c, oid rid,
void *value);
typedef int (*table_insert_fptr)(sql_trans *tr, sql_table *t, ...);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
