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
02b8f4cd
Commit
02b8f4cd
authored
Oct 15, 2013
by
Kenton Varda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix GCC issues.
parent
4e386165
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
15 deletions
+10
-15
arena.c++
c++/src/capnp/arena.c++
+6
-5
capability.h
c++/src/capnp/capability.h
+2
-5
object.h
c++/src/capnp/object.h
+0
-3
exception-test.c++
c++/src/kj/exception-test.c++
+2
-2
No files found.
c++/src/capnp/arena.c++
View file @
02b8f4cd
...
...
@@ -57,9 +57,9 @@ public:
:
exception
(
exception
),
message
(
firstSegmentWordSize
==
0
?
SUGGESTED_FIRST_SEGMENT_WORDS
:
firstSegmentWordSize
)
{}
RemotePromise
<
TypelessResults
>
send
()
override
{
return
RemotePromise
<
TypelessResults
>
(
kj
::
cp
(
exception
),
TypelessResults
::
Pipeline
(
kj
::
refcounted
<
BrokenPipeline
>
(
exception
)));
RemotePromise
<
ObjectPointer
>
send
()
override
{
return
RemotePromise
<
ObjectPointer
>
(
kj
::
cp
(
exception
),
ObjectPointer
::
Pipeline
(
kj
::
refcounted
<
BrokenPipeline
>
(
exception
)));
}
kj
::
Exception
exception
;
...
...
@@ -73,10 +73,11 @@ public:
:
exception
(
kj
::
Exception
::
Nature
::
PRECONDITION
,
kj
::
Exception
::
Durability
::
PERMANENT
,
""
,
0
,
kj
::
str
(
description
))
{}
Request
<
ObjectPointer
,
TypelessResults
>
newCall
(
Request
<
ObjectPointer
,
ObjectPointer
>
newCall
(
uint64_t
interfaceId
,
uint16_t
methodId
,
uint
firstSegmentWordSize
)
const
override
{
auto
hook
=
kj
::
heap
<
BrokenRequest
>
(
exception
,
firstSegmentWordSize
);
return
Request
<
ObjectPointer
,
TypelessResults
>
(
hook
->
message
.
getRoot
(),
kj
::
mv
(
hook
));
auto
root
=
hook
->
message
.
getRoot
();
return
Request
<
ObjectPointer
,
ObjectPointer
>
(
root
,
kj
::
mv
(
hook
));
}
VoidPromiseAndPipeline
call
(
uint64_t
interfaceId
,
uint16_t
methodId
,
...
...
c++/src/capnp/capability.h
View file @
02b8f4cd
...
...
@@ -162,16 +162,13 @@ protected:
private
:
kj
::
Own
<
const
ClientHook
>
hook
;
template
<
typename
,
::
capnp
::
Kind
>
friend
struct
::
capnp
::
_
::
PointerHelpers
;
static
kj
::
Own
<
const
ClientHook
>
makeLocalClient
(
kj
::
Own
<
Capability
::
Server
>&&
server
,
const
kj
::
EventLoop
&
eventLoop
);
template
<
typename
,
Kind
>
friend
struct
_
::
PointerHelpers
;
friend
struct
DynamicCapability
;
friend
class
Orphanage
;
template
<
typename
T
,
Kind
k
>
friend
struct
_
::
PointerHelpers
;
friend
struct
DynamicStruct
;
friend
struct
DynamicList
;
template
<
typename
,
Kind
>
...
...
c++/src/capnp/object.h
View file @
02b8f4cd
...
...
@@ -233,9 +233,6 @@ struct ObjectPointer {
};
};
// TODO(now): delete
typedef
ObjectPointer
TypelessResults
;
template
<>
class
Orphan
<
ObjectPointer
>
{
// An orphaned object of unknown type.
...
...
c++/src/kj/exception-test.c++
View file @
02b8f4cd
...
...
@@ -55,7 +55,7 @@ class ThrowingDestructor: public UnwindDetector {
public
:
~
ThrowingDestructor
()
noexcept
(
false
)
{
catchExceptionsIfUnwinding
([]()
{
KJ_FAIL_ASSERT
(
"
bar
"
)
{
break
;
}
KJ_FAIL_ASSERT
(
"
this is a test, not a real bug
"
)
{
break
;
}
});
}
};
...
...
@@ -67,7 +67,7 @@ TEST(Exception, UnwindDetector) {
});
KJ_IF_MAYBE
(
ex
,
e
)
{
EXPECT_EQ
(
"
bar
"
,
ex
->
getDescription
());
EXPECT_EQ
(
"
this is a test, not a real bug
"
,
ex
->
getDescription
());
}
else
{
ADD_FAILURE
()
<<
"Expected exception"
;
}
...
...
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