Fix CLANG build break

Merge branch 'unstable' into RELEASE_5
2020-03-04 17:24:00 -05:00 · 2020-03-04 17:13:32 -05:00 · 2020-03-04 17:09:29 -05:00 · 2020-03-01 21:43:21 -05:00 · 2020-03-01 19:53:32 -05:00 · 2020-02-28 23:53:54 -05:00
3 changed files with 2 additions and 59 deletions
@@ -1,58 +0,0 @@
-{
-    "files.associations": {
-        "zmalloc.h": "c",
-        "stat.h": "c",
-        "array": "cpp",
-        "atomic": "cpp",
-        "*.tcc": "cpp",
-        "cctype": "cpp",
-        "chrono": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "condition_variable": "cpp",
-        "cstdarg": "cpp",
-        "cstddef": "cpp",
-        "cstdint": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "cstring": "cpp",
-        "ctime": "cpp",
-        "cwchar": "cpp",
-        "cwctype": "cpp",
-        "deque": "cpp",
-        "list": "cpp",
-        "unordered_map": "cpp",
-        "vector": "cpp",
-        "exception": "cpp",
-        "fstream": "cpp",
-        "functional": "cpp",
-        "future": "cpp",
-        "initializer_list": "cpp",
-        "iomanip": "cpp",
-        "iosfwd": "cpp",
-        "iostream": "cpp",
-        "istream": "cpp",
-        "limits": "cpp",
-        "memory": "cpp",
-        "mutex": "cpp",
-        "new": "cpp",
-        "numeric": "cpp",
-        "optional": "cpp",
-        "ostream": "cpp",
-        "ratio": "cpp",
-        "scoped_allocator": "cpp",
-        "sstream": "cpp",
-        "stdexcept": "cpp",
-        "streambuf": "cpp",
-        "string_view": "cpp",
-        "system_error": "cpp",
-        "thread": "cpp",
-        "cinttypes": "cpp",
-        "tuple": "cpp",
-        "type_traits": "cpp",
-        "typeinfo": "cpp",
-        "utility": "cpp",
-        "set": "cpp",
-        "algorithm": "cpp"
-    }
-}
@@ -55,6 +55,7 @@
 #include <algorithm>
 #include <memory>
 #include <map>
+#include <string>
 #ifdef __cplusplus
 extern "C" {
 #include <lua.h>
@@ -1,3 +1,3 @@
-#define KEYDB_REAL_VERSION "0.0.0"
+#define KEYDB_REAL_VERSION "5.3.2"
 extern const char *KEYDB_SET_VERSION;   // Unlike real version, this can be overriden by the config
Author	SHA1	Message	Date
John Sully	e523afa741	Fix CLANG build break	2020-03-04 17:24:00 -05:00
John Sully	13cf8bbeb7	Merge branch 'unstable' into RELEASE_5	2020-03-04 17:13:32 -05:00
John Sully	693ba4ed4a	Merge branch 'unstable' into RELEASE_5	2020-03-04 17:09:29 -05:00
John Sully	faa87ed839	Merge branch 'unstable' into RELEASE_5	2020-03-01 21:43:21 -05:00
benschermel	7a244bb847	Merge branch 'unstable' into RELEASE_5	2020-03-01 19:53:32 -05:00
John Sully	3ce6441a0c	Bump version	2020-02-28 23:53:54 -05:00
John Sully	6d00a1a5cf	Merge branch 'unstable' into RELEASE_5	2020-02-28 23:53:00 -05:00
John Sully	f4319c1280	Bump version	2020-01-20 19:20:50 -05:00
John Sully	c575e7df94	Avoid crash due to excessive posted functions for AOF rewrite	2020-01-11 16:34:30 -05:00
John Sully	e603e57588	Merge branch 'unstable' into RELEASE_5	2020-01-10 17:46:23 -05:00
John Sully	d0654af74f	Merge branch 'unstable' into RELEASE_5	2020-01-06 14:24:49 -05:00
John Sully	39acb312ef	Bump version	2020-01-06 12:07:57 -05:00
John Sully	b643c38204	Merge branch 'unstable' into RELEASE_5	2020-01-06 12:07:11 -05:00
John Sully	7dd53182e0	Bump version	2019-11-21 20:16:42 -05:00
John Sully	53b95d830a	Merge branch 'unstable' into RELEASE_5	2019-11-21 20:16:23 -05:00
John Sully	a91f58b8fd	Fix potential race in pubsub	2019-10-25 02:44:14 -04:00
John Sully	3013799664	bump version	2019-10-25 01:00:28 -04:00
John Sully	f8220a658e	Merge branch 'unstable' into RELEASE_5	2019-10-24 23:39:18 -04:00
John Sully	3fac516950	Disable multithreaded KEYS due to bugs	2019-10-21 12:21:46 -04:00
John Sully	2f65aa2337	Merge branch 'unstable' into RELEASE_5	2019-10-16 12:47:06 -04:00
John Sully	0a0c2146c8	Bump version	2019-10-01 17:53:48 -04:00
John Sully	66cef6646c	Merge branch 'unstable' into RELEASE_5	2019-09-30 00:28:12 -04:00
John Sully	4589e861ab	Fix issue where AOF events are posted to the wrong event loop and not properly cleaned up	2019-09-19 15:40:09 -04:00
John Sully	71d5a10621	bump version	2019-09-06 13:31:40 -04:00
John Sully	50a6a3ca38	Fix issue where Active Replicas were commiting data to the wrong database under load	2019-09-06 13:30:15 -04:00
John Sully	f83a89f82a	Acquire the lock for modules that don't acquire it before calling like they are supposed to	2019-08-29 15:41:03 -04:00
John Sully	bf905a78f0	Bump version	2019-08-27 15:32:24 -04:00
John Sully	fad9483fc9	Fix race condition in PUB/SUB and other async reply commands where the client can be freed before our handler is executed on the client thread. When this occurs the client pointer is dangling	2019-08-27 15:31:47 -04:00
John Sully	6b6e6f6c1e	Fix crash in RediSearch	2019-07-29 15:08:57 -04:00
John Sully	b0a0f03b96	RREPLAY failures should be logged	2019-07-24 22:49:55 -04:00
John Sully	f1982ca63d	Issue #64 RREPLAY isn't binary safe. Add fix and test.	2019-07-24 22:31:44 -04:00
John Sully	25e18a7de9	Release version 5	2019-07-18 20:50:40 -04:00