MonetDB: Jan2014 - wrd and oid are not necessarily the same size.

[Sjoerd Mullender]

Changeset: b08e7dea15af for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b08e7dea15af
Modified Files:
        sql/server/sql_atom.c
Branch: Jan2014
Log Message:

wrd and oid are not necessarily the same size.


diffs (75 lines):

diff --git a/sql/server/sql_atom.c b/sql/server/sql_atom.c
--- a/sql/server/sql_atom.c
+++ b/sql/server/sql_atom.c
@@ -552,8 +552,10 @@ atom_cast(atom *a, sql_subtype *tp)
                                        return 0;
                                break;
                        case TYPE_int:
+#if SIZEOF_OID == SIZEOF_INT
+                       case TYPE_oid:
+#endif
 #if SIZEOF_WRD == SIZEOF_INT
-                       case TYPE_oid:
                        case TYPE_wrd:
 #endif
                                if (at->type->localtype == TYPE_bte) 
@@ -564,8 +566,10 @@ atom_cast(atom *a, sql_subtype *tp)
                                        return 0;
                                break;
                        case TYPE_lng:
+#if SIZEOF_OID == SIZEOF_LNG
+                       case TYPE_oid:
+#endif
 #if SIZEOF_WRD == SIZEOF_LNG
-                       case TYPE_oid:
                        case TYPE_wrd:
 #endif
                                if (at->type->localtype == TYPE_bte) 
@@ -602,8 +606,10 @@ atom_cast(atom *a, sql_subtype *tp)
                                        return 0;
                                break;
                        case TYPE_int:
+#if SIZEOF_OID == SIZEOF_INT
+                       case TYPE_oid:
+#endif
 #if SIZEOF_WRD == SIZEOF_INT
-                       case TYPE_oid:
                        case TYPE_wrd:
 #endif
                                if (at->type->localtype == TYPE_bte) 
@@ -614,8 +620,10 @@ atom_cast(atom *a, sql_subtype *tp)
                                        return 0;
                                break;
                        case TYPE_lng:
+#if SIZEOF_OID == SIZEOF_LNG
+                       case TYPE_oid:
+#endif
 #if SIZEOF_WRD == SIZEOF_LNG
-                       case TYPE_oid:
                        case TYPE_wrd:
 #endif
                                if (at->type->localtype == TYPE_bte) 
@@ -731,8 +739,10 @@ atom_cast(atom *a, sql_subtype *tp)
                                        return 0;
                                break;
                        case TYPE_int:
+#if SIZEOF_OID == SIZEOF_INT
+                       case TYPE_oid:
+#endif
 #if SIZEOF_WRD == SIZEOF_INT
-                       case TYPE_oid:
                        case TYPE_wrd:
 #endif
                                if (at->type->localtype == TYPE_bte) 
@@ -743,8 +753,10 @@ atom_cast(atom *a, sql_subtype *tp)
                                        return 0;
                                break;
                        case TYPE_lng:
+#if SIZEOF_OID == SIZEOF_LNG
+                       case TYPE_oid:
+#endif
 #if SIZEOF_WRD == SIZEOF_LNG
-                       case TYPE_oid:
                        case TYPE_wrd:
 #endif
                                if (at->type->localtype == TYPE_bte) 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list