Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
capnproto
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
capnproto
Commits
076d49a2
Commit
076d49a2
authored
Oct 31, 2013
by
Kenton Varda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Work around spurrious GCC 4.7 warning, and split RPC code into separate library.
parent
ba49d48a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
9 deletions
+18
-9
Makefile.am
c++/Makefile.am
+9
-3
rpc.c++
c++/src/capnp/rpc.c++
+5
-2
mega-test-quick.cfg
mega-test-quick.cfg
+4
-4
No files found.
c++/Makefile.am
View file @
076d49a2
...
...
@@ -163,7 +163,7 @@ includecapnp_HEADERS = \
src/capnp/generated-header-support.h
\
src/capnp/rpc.h
lib_LTLIBRARIES
=
libkj.la libcapnp.la libcapnpc.la
lib_LTLIBRARIES
=
libkj.la libcapnp.la libcapnp
-rpc.la libcapnp
c.la
# -lpthread is here to work around https://bugzilla.redhat.com/show_bug.cgi?id=661333
libkj_la_LIBADD
=
$(PTHREAD_LIBS)
-lpthread
...
...
@@ -206,7 +206,12 @@ libcapnp_la_SOURCES= \
src/capnp/dynamic.c++
\
src/capnp/stringify.c++
\
src/capnp/serialize.c++
\
src/capnp/serialize-packed.c++
\
src/capnp/serialize-packed.c++
# -lpthread is here to work around https://bugzilla.redhat.com/show_bug.cgi?id=661333
libcapnp_rpc_la_LIBADD
=
libcapnp.la libkj.la
$(PTHREAD_LIBS)
-lpthread
libcapnp_rpc_la_LDFLAGS
=
-release
$(VERSION)
-no-undefined
libcapnp_rpc_la_SOURCES
=
\
src/capnp/rpc.c++
\
src/capnp/rpc.capnp.c++
\
src/capnp/rpc.capnp.h
...
...
@@ -299,7 +304,8 @@ $(test_capnpc_outputs): test_capnpc_middleman
BUILT_SOURCES
=
$(test_capnpc_outputs)
check_PROGRAMS
=
capnp-test capnp-evolution-test
capnp_test_LDADD
=
gtest/lib/libgtest.la gtest/lib/libgtest_main.la libcapnpc.la libcapnp.la libkj.la
capnp_test_LDADD
=
gtest/lib/libgtest.la gtest/lib/libgtest_main.la
\
libcapnpc.la libcapnp-rpc.la libcapnp.la libkj.la
capnp_test_CPPFLAGS
=
-Igtest
/include
-I
$(srcdir)
/gtest/include
capnp_test_SOURCES
=
\
src/kj/common-test.c++
\
...
...
c++/src/capnp/rpc.c++
View file @
076d49a2
...
...
@@ -923,8 +923,11 @@ private:
exports
=
kj
::
Vector
<
ExportId
>
(
caps
.
getWithoutLock
().
size
());
for
(
auto
&
entry
:
caps
.
getWithoutLock
())
{
KJ_IF_MAYBE
(
exportId
,
connectionState
.
writeDescriptor
(
entry
.
second
.
cap
->
addRef
(),
entry
.
second
.
builder
,
tables
))
{
// If maybeExportId is inlined, GCC 4.7 reports a spurious "may be used uninitialized"
// error (GCC 4.8 and Clang do not complain).
auto
maybeExportId
=
connectionState
.
writeDescriptor
(
entry
.
second
.
cap
->
addRef
(),
entry
.
second
.
builder
,
tables
);
KJ_IF_MAYBE
(
exportId
,
maybeExportId
)
{
exports
.
add
(
*
exportId
);
}
}
...
...
mega-test-quick.cfg
View file @
076d49a2
linux-gcc-4.7 1564 ./super-test.sh tmpdir capnp-gcc-4.7 quick
linux-gcc-4.8 1
567
./super-test.sh tmpdir capnp-gcc-4.8 quick gcc-4.8
linux-clang 1
581
./super-test.sh tmpdir capnp-clang quick clang
mac 7
40
./super-test.sh remote beat caffeinate quick
cygwin 7
45
./super-test.sh remote Kenton@flashman quick
linux-gcc-4.8 1
601
./super-test.sh tmpdir capnp-gcc-4.8 quick gcc-4.8
linux-clang 1
615
./super-test.sh tmpdir capnp-clang quick clang
mac 7
52
./super-test.sh remote beat caffeinate quick
cygwin 7
57
./super-test.sh remote Kenton@flashman quick
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment