diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2018-05-31 03:53:34 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2018-05-31 03:53:34 +0000 |
| commit | 8221a129922841c9c8ce35f6ad42437729690715 (patch) | |
| tree | 9e29781491f5b3ecf8b5a2914760fb6d05ca5188 /databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp | |
| parent | emulators/citra: unbreak on i386 with clang 5+ (diff) | |
Update to 5.2.2.
Notes
Notes:
svn path=/head/; revision=471193
Diffstat (limited to 'databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp')
| -rw-r--r-- | databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp b/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp index 412a112cb3b0..9edda4074f23 100644 --- a/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp +++ b/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp @@ -1,6 +1,6 @@ ---- fdbserver/fdbserver.actor.cpp.orig 2018-04-19 02:55:50 UTC +--- fdbserver/fdbserver.actor.cpp.orig 2018-05-11 01:30:59 UTC +++ fdbserver/fdbserver.actor.cpp -@@ -59,7 +59,7 @@ +@@ -60,7 +60,7 @@ #define BOOST_DATE_TIME_NO_LIB #include <boost/interprocess/managed_shared_memory.hpp> @@ -9,7 +9,7 @@ #include <execinfo.h> #include <signal.h> #ifdef ALLOC_INSTRUMENTATION -@@ -72,6 +72,7 @@ +@@ -73,6 +73,7 @@ #endif #include "flow/SimpleOpt.h" @@ -17,7 +17,7 @@ enum { OPT_CONNFILE, OPT_SEEDCONNFILE, OPT_SEEDCONNSTRING, OPT_ROLE, OPT_LISTEN, OPT_PUBLICADDR, OPT_DATAFOLDER, OPT_LOGFOLDER, OPT_PARENTPID, OPT_NEWCONSOLE, OPT_NOBOX, OPT_TESTFILE, OPT_RESTARTING, OPT_RANDOMSEED, OPT_KEY, OPT_MEMLIMIT, OPT_STORAGEMEMLIMIT, OPT_MACHINEID, OPT_DCID, OPT_MACHINE_CLASS, OPT_BUGGIFY, OPT_VERSION, OPT_CRASHONERROR, OPT_HELP, OPT_NETWORKIMPL, OPT_NOBUFSTDOUT, OPT_BUFSTDOUTERR, OPT_TRACECLOCK, OPT_NUMTESTERS, OPT_DEVHELP, OPT_ROLLSIZE, OPT_MAXLOGS, OPT_MAXLOGSSIZE, OPT_KNOB, OPT_TESTSERVERS, OPT_TEST_ON_SERVERS, OPT_METRICSCONNFILE, OPT_METRICSPREFIX, -@@ -350,7 +351,7 @@ public: +@@ -351,7 +352,7 @@ class WorldReadablePermissions { (public) throw platform_error(); } permission.set_permissions( &sa ); @@ -26,7 +26,7 @@ // There is nothing to do here, since the default permissions are fine #else #error Port me! -@@ -360,7 +361,7 @@ public: +@@ -361,7 +362,7 @@ class WorldReadablePermissions { (public) virtual ~WorldReadablePermissions() { #ifdef _WIN32 LocalFree( sa.lpSecurityDescriptor ); |