Fix harmless compiler warnings associated with SQLITE_ENABLE_HIDDEN_COLUMNS.

FossilOrigin-Name: 9c392c1019ee15f27c8e05b41246d2844f91f6c0

diff --git a/manifest b/manifest
index 63b6375876c8c2448588bec6489cf6d844ad033c..74fac31c3eddd1fc56dd58a58ebd9f93b6dc5b81 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Small\ssize\sand\sperformance\soptimization\sto\sthe\sVDBE\scomparison\sopcodes.
-D 2015-12-31T04:34:26.528
+C Fix\sharmless\scompiler\swarnings\sassociated\swith\sSQLITE_ENABLE_HIDDEN_COLUMNS.
+D 2015-12-31T15:34:03.678
 F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5fff077fcc46de7714ed6eebb6159a4c00eab751
@@ -279,7 +279,7 @@ F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
 F src/btree.c 5ac3f868d4f20a67f0f00a1014940f902b511558
 F src/btree.h 2d76dee44704c47eed323356a758662724b674a0
 F src/btreeInt.h b5f2651b41808f038dee9282c5dc0232ce6532d3
-F src/build.c 5a8611a01cbf67c736d81304e054ec361ef8963d
+F src/build.c 249e9605fc423feeca0316e7018df04da8c345d5
 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
 F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
 F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@ -338,7 +338,7 @@ F src/shell.c ace08b69cd9702143cf87b5bd20b744a56f832fd
 F src/sqlite.h.in 7d87d71b9a4689c51fa092f48f16590ff71558e3
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
-F src/sqliteInt.h d68c05b69767224eea116f07793a531286946776
+F src/sqliteInt.h 92f83ab4612141f95cdd663ea55fa4528f3f8c2a
 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
 F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
 F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@ -1406,7 +1406,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 6a4cfc7ab62046eb718ce59eff6b632f239312ac
-R 38bdbc546325a042578b5eb533fe5e2f
+P 7a0b9413fa94d3f4fa9751ddf9b213a1238954f1
+R 793126e19a875ee34b3c925c6d9cf329
 U drh
-Z 5aa34f553c2d2033c492b62e2956faac
+Z 7a54e045f07d4dcaeff2de7160303dce

diff --git a/manifest.uuid b/manifest.uuid
index 7de58c7d759e618b6dd13aa971d5f2358fe337d9..6672b8e8dd4844a2b3eb6939670c2647dc336fdf 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7a0b9413fa94d3f4fa9751ddf9b213a1238954f1
\ No newline at end of file
+9c392c1019ee15f27c8e05b41246d2844f91f6c0
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 5d6201a5335699dd43ef99c45226b67d9a3381b0..553e249fa45a4a29c8945d8627abe85c4855c91c 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -1047,15 +1047,15 @@ begin_table_error:
 /* Set properties of a table column based on the (magical)
 ** name of the column.
 */
-void sqlite3ColumnPropertiesFromName(Table *pTab, Column *pCol){
 #if SQLITE_ENABLE_HIDDEN_COLUMNS
+void sqlite3ColumnPropertiesFromName(Table *pTab, Column *pCol){
   if( sqlite3_strnicmp(pCol->zName, "__hidden__", 10)==0 ){
     pCol->colFlags |= COLFLAG_HIDDEN;
   }else if( pTab && pCol!=pTab->aCol && (pCol[-1].colFlags & COLFLAG_HIDDEN) ){
     pTab->tabFlags |= TF_OOOHidden;
   }
-#endif
 }
+#endif
 
 
 /*

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 299fe8647dfd1c7d856ad78803d028d083afb47e..e1fe6dae79e32a1f953a26f3f9bb44f9df4ead1e 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3348,7 +3348,11 @@ void sqlite3OpenMasterTable(Parse *, int);
 Index *sqlite3PrimaryKeyIndex(Table*);
 i16 sqlite3ColumnOfIndex(Index*, i16);
 void sqlite3StartTable(Parse*,Token*,Token*,int,int,int,int);
-void sqlite3ColumnPropertiesFromName(Table*, Column*);
+#if SQLITE_ENABLE_HIDDEN_COLUMNS
+  void sqlite3ColumnPropertiesFromName(Table*, Column*);
+#else
+# define sqlite3ColumnPropertiesFromName(T,C) /* no-op */
+#endif
 void sqlite3AddColumn(Parse*,Token*);
 void sqlite3AddNotNull(Parse*, int);
 void sqlite3AddPrimaryKey(Parse*, ExprList*, int, int, int);