/ Changes On Branch icc-fix
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch icc-fix Excluding Merge-Ins

This is equivalent to a diff from 0c246017b4 to dbb59f6156

2017-07-08
22:30
Add the --icc, --gcc7, and --orm options to the speed-check.sh test script. (check-in: 70dae08a9a user: drh tags: trunk)
18:27
Disable compiler intrinsics when using the Intel C Compiler. (Leaf check-in: dbb59f6156 user: drh tags: icc-fix)
2017-07-07
22:58
Merge in all the latest trunk enhancements. (check-in: 7f48f6ab2a user: drh tags: apple-osx)
22:47
Basic test cases for PRAGMA secure_delete=FAST. (check-in: 0c246017b4 user: drh tags: trunk)
21:20
Fix comment in the Win32 VFS for lsm1. (check-in: 12a421bcac user: mistachkin tags: trunk)

Changes to src/sqliteInt.h.

112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
** There was once also a CLANG_VERSION macro.  However, we learn that the
** version numbers in clang are for "marketing" only and are inconsistent
** and unreliable.  Fortunately, all versions of clang also recognize the
** gcc version numbers and have reasonable settings for gcc version numbers,
** so the GCC_VERSION macro will be set to a correct non-zero value even
** when compiling with clang.
*/
#if defined(__GNUC__) && !defined(SQLITE_DISABLE_INTRINSIC)
# define GCC_VERSION (__GNUC__*1000000+__GNUC_MINOR__*1000+__GNUC_PATCHLEVEL__)
#else
# define GCC_VERSION 0
#endif
#if defined(_MSC_VER) && !defined(SQLITE_DISABLE_INTRINSIC)
# define MSVC_VERSION _MSC_VER
#else







|







112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
** There was once also a CLANG_VERSION macro.  However, we learn that the
** version numbers in clang are for "marketing" only and are inconsistent
** and unreliable.  Fortunately, all versions of clang also recognize the
** gcc version numbers and have reasonable settings for gcc version numbers,
** so the GCC_VERSION macro will be set to a correct non-zero value even
** when compiling with clang.
*/
#if defined(__GNUC__) && !defined(SQLITE_DISABLE_INTRINSIC) && !defined(__ICC)
# define GCC_VERSION (__GNUC__*1000000+__GNUC_MINOR__*1000+__GNUC_PATCHLEVEL__)
#else
# define GCC_VERSION 0
#endif
#if defined(_MSC_VER) && !defined(SQLITE_DISABLE_INTRINSIC)
# define MSVC_VERSION _MSC_VER
#else