Prevent the implementation of the toreal() SQL function from being 'optimized' by...

FossilOrigin-Name: 047bd1c24553b00ccf12d7745bb4c46820b91f5e

diff --git a/manifest b/manifest
index 6b536697bd559584257b4a3c957ddd90c9f577ad..dc0eaaf0432269c523facb4490ac4a9b078df82f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\supdates\sfrom\strunk.
-D 2013-08-29T01:11:45.298
+C Prevent\sthe\simplementation\sof\sthe\storeal()\sSQL\sfunction\sfrom\sbeing\s'optimized'\sby\sMSVC.
+D 2013-08-29T01:17:24.949
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -175,7 +175,7 @@ F src/delete.c 2317c814866d9aa71fea16b3faf4fdd4d6a49b94
 F src/expr.c 4d89bd03a04fcdb5ff71d86b4e0cc7d3230797b8
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c 914a6bbd987d857c41ac9d244efa6641f36faadb
-F src/func.c 6099094d90f401c9fe7ed565d16b6ab07926960e
+F src/func.c 5c85fed36b47a484e8b85c6528348f83ec5f8855
 F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
 F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
 F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
@@ -1109,7 +1109,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P abe82c634ccda7d62687df5917d18a9d6e411142 9229aeb361f9805894321327d05aba855b8799f3
-R 37bb2eb70562f6e2f1a6470983432e85
+P 375dfe288fd0c4eb3c343a3cb23a7e3851903805
+R 7c55303025c97a6a9c8303db7e5df83c
 U mistachkin
-Z 8236c13d7d380aaddad2f7d32e5c8a7f
+Z 349da4d5082e6d065b9211864249410e

diff --git a/manifest.uuid b/manifest.uuid
index fe6fc5eb2633447a993a9b94ffe772afea411d08..761fcfda927a717460a864fba977d1ab3353f453 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-375dfe288fd0c4eb3c343a3cb23a7e3851903805
\ No newline at end of file
+047bd1c24553b00ccf12d7745bb4c46820b91f5e
\ No newline at end of file

diff --git a/src/func.c b/src/func.c
index 36b0e5f3788e656bb9bb77e294287e5e3831856d..fb999c9f984f5be94614fa24100d005d212c9a32 100644 (file)
--- a/src/func.c
+++ b/src/func.c
@@ -1015,6 +1015,9 @@ static void tointegerFunc(
 ** toreal(X):  If X can be losslessly converted into a real number, then
 ** do so and return that real number.  Otherwise return NULL.
 */
+#if defined(_MSC_VER)
+#pragma optimize("", off)
+#endif
 static void torealFunc(
   sqlite3_context *context,
   int argc,
@@ -1056,6 +1059,9 @@ static void torealFunc(
     }
   }
 }
+#if defined(_MSC_VER)
+#pragma optimize("", on)
+#endif
 
 /*
 ** The unicode() function.  Return the integer unicode code-point value