blob: e025369315ca7ee280eedb36b90d393a58d0cc93 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
require "formula"
class Rethinkdb < Formula
homepage "http://www.rethinkdb.com/"
url "http://download.rethinkdb.com/dist/rethinkdb-1.15.2.tgz"
sha1 "31c14c764355e555734c7f4479397bd3bd7e0e44"
bottle do
sha1 "2710231d7a0013779e2d61228aa0395e8261611f" => :yosemite
sha1 "c8c7f4e2d05535953de0ba229ac3c12ac11de8b9" => :mavericks
sha1 "bcbdc4b123365987dd5ce6f6cc0f628302d95e3c" => :mountain_lion
end
depends_on :macos => :lion
# Embeds an older V8, whose gyp still requires the full Xcode
# Reported upstream: https://github.com/rethinkdb/rethinkdb/issues/2581
depends_on :xcode => :build
depends_on "boost" => :build
depends_on "openssl"
fails_with :gcc do
build 5666 # GCC 4.2.1
cause "RethinkDB uses C++0x"
end
# boost 1.56 compatibility
# https://github.com/rethinkdb/rethinkdb/issues/3044#issuecomment-55478774
patch :DATA
def install
args = ["--prefix=#{prefix}"]
# brew's v8 is too recent. rethinkdb uses an older v8 API
args += ["--fetch", "v8"]
# rethinkdb requires that protobuf be linked against libc++
# but brew's protobuf is sometimes linked against libstdc++
args += ["--fetch", "protobuf"]
# support gcc with boost 1.56
# https://github.com/rethinkdb/rethinkdb/issues/3044#issuecomment-55471981
args << "CXXFLAGS=-DBOOST_VARIANT_DO_NOT_USE_VARIADIC_TEMPLATES"
system "./configure", *args
system "make"
system "make", "install-osx"
mkdir_p "#{var}/log/rethinkdb"
end
def plist; <<-EOS.undent
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>#{plist_name}</string>
<key>ProgramArguments</key>
<array>
<string>#{opt_bin}/rethinkdb</string>
<string>-d</string>
<string>#{var}/rethinkdb</string>
</array>
<key>WorkingDirectory</key>
<string>#{HOMEBREW_PREFIX}</string>
<key>StandardOutPath</key>
<string>#{var}/log/rethinkdb/rethinkdb.log</string>
<key>StandardErrorPath</key>
<string>#{var}/log/rethinkdb/rethinkdb.log</string>
<key>RunAtLoad</key>
<true/>
<key>KeepAlive</key>
<true/>
</dict>
</plist>
EOS
end
end
__END__
diff --git a/src/clustering/reactor/reactor_be_primary.cc b/src/clustering/reactor/reactor_be_primary.cc
index 3f583fc..945f78b 100644
--- a/src/clustering/reactor/reactor_be_primary.cc
+++ b/src/clustering/reactor/reactor_be_primary.cc
@@ -290,7 +290,7 @@ void do_backfill(
bool check_that_we_see_our_broadcaster(const boost::optional<boost::optional<broadcaster_business_card_t> > &maybe_a_
guarantee(maybe_a_business_card, "Not connected to ourselves\n");
- return maybe_a_business_card.get();
+ return static_cast<bool>(maybe_a_business_card.get());
}
bool reactor_t::attempt_backfill_from_peers(directory_entry_t *directory_entry,
|
