Commit 90c108ea authored by Kenton Varda's avatar Kenton Varda

Oops, fix bugs.

parent 02b8f4cd
...@@ -1486,7 +1486,7 @@ DynamicValue::Reader::Reader(ConstSchema constant) { ...@@ -1486,7 +1486,7 @@ DynamicValue::Reader::Reader(ConstSchema constant) {
} }
DynamicValue::Reader::Reader(const Reader& other) { DynamicValue::Reader::Reader(const Reader& other) {
switch (type) { switch (other.type) {
case UNKNOWN: case UNKNOWN:
case VOID: case VOID:
case BOOL: case BOOL:
...@@ -1516,8 +1516,8 @@ DynamicValue::Reader::Reader(const Reader& other) { ...@@ -1516,8 +1516,8 @@ DynamicValue::Reader::Reader(const Reader& other) {
memcpy(this, &other, sizeof(*this)); memcpy(this, &other, sizeof(*this));
} }
DynamicValue::Reader::Reader(Reader&& other) { DynamicValue::Reader::Reader(Reader&& other) noexcept {
switch (type) { switch (other.type) {
case UNKNOWN: case UNKNOWN:
case VOID: case VOID:
case BOOL: case BOOL:
...@@ -1547,7 +1547,7 @@ DynamicValue::Reader::Reader(Reader&& other) { ...@@ -1547,7 +1547,7 @@ DynamicValue::Reader::Reader(Reader&& other) {
memcpy(this, &other, sizeof(*this)); memcpy(this, &other, sizeof(*this));
} }
DynamicValue::Reader::~Reader() { DynamicValue::Reader::~Reader() noexcept(false) {
if (type == CAPABILITY) { if (type == CAPABILITY) {
kj::dtor(capabilityValue); kj::dtor(capabilityValue);
} }
...@@ -1569,7 +1569,7 @@ DynamicValue::Reader& DynamicValue::Reader::operator=(Reader&& other) { ...@@ -1569,7 +1569,7 @@ DynamicValue::Reader& DynamicValue::Reader::operator=(Reader&& other) {
} }
DynamicValue::Builder::Builder(Builder& other) { DynamicValue::Builder::Builder(Builder& other) {
switch (type) { switch (other.type) {
case UNKNOWN: case UNKNOWN:
case VOID: case VOID:
case BOOL: case BOOL:
...@@ -1602,8 +1602,8 @@ DynamicValue::Builder::Builder(Builder& other) { ...@@ -1602,8 +1602,8 @@ DynamicValue::Builder::Builder(Builder& other) {
memcpy(this, &other, sizeof(*this)); memcpy(this, &other, sizeof(*this));
} }
DynamicValue::Builder::Builder(Builder&& other) { DynamicValue::Builder::Builder(Builder&& other) noexcept {
switch (type) { switch (other.type) {
case UNKNOWN: case UNKNOWN:
case VOID: case VOID:
case BOOL: case BOOL:
...@@ -1636,7 +1636,7 @@ DynamicValue::Builder::Builder(Builder&& other) { ...@@ -1636,7 +1636,7 @@ DynamicValue::Builder::Builder(Builder&& other) {
memcpy(this, &other, sizeof(*this)); memcpy(this, &other, sizeof(*this));
} }
DynamicValue::Builder::~Builder() { DynamicValue::Builder::~Builder() noexcept(false) {
if (type == CAPABILITY) { if (type == CAPABILITY) {
kj::dtor(capabilityValue); kj::dtor(capabilityValue);
} }
......
...@@ -597,8 +597,8 @@ public: ...@@ -597,8 +597,8 @@ public:
inline Reader(T&& value): Reader(toDynamic(kj::mv(value))) {} inline Reader(T&& value): Reader(toDynamic(kj::mv(value))) {}
Reader(const Reader& other); Reader(const Reader& other);
Reader(Reader&& other); Reader(Reader&& other) noexcept;
~Reader(); ~Reader() noexcept(false);
Reader& operator=(const Reader& other); Reader& operator=(const Reader& other);
Reader& operator=(Reader&& other); Reader& operator=(Reader&& other);
// Unfortunately, we cannot use the implicit definitions of these since DynamicCapability is not // Unfortunately, we cannot use the implicit definitions of these since DynamicCapability is not
...@@ -694,8 +694,8 @@ public: ...@@ -694,8 +694,8 @@ public:
inline Builder(T value): Builder(toDynamic(value)) {} inline Builder(T value): Builder(toDynamic(value)) {}
Builder(Builder& other); Builder(Builder& other);
Builder(Builder&& other); Builder(Builder&& other) noexcept;
~Builder(); ~Builder() noexcept(false);
Builder& operator=(Builder& other); Builder& operator=(Builder& other);
Builder& operator=(Builder&& other); Builder& operator=(Builder&& other);
// Unfortunately, we cannot use the implicit definitions of these since DynamicCapability is not // Unfortunately, we cannot use the implicit definitions of these since DynamicCapability is not
......
linux-gcc-4.7 1544 ./super-test.sh tmpdir capnp-gcc-4.7 quick linux-gcc-4.7 1564 ./super-test.sh tmpdir capnp-gcc-4.7 quick
linux-gcc-4.8 1547 ./super-test.sh tmpdir capnp-gcc-4.8 quick gcc-4.8 linux-gcc-4.8 1567 ./super-test.sh tmpdir capnp-gcc-4.8 quick gcc-4.8
linux-clang 1561 ./super-test.sh tmpdir capnp-clang quick clang linux-clang 1581 ./super-test.sh tmpdir capnp-clang quick clang
mac 740 ./super-test.sh remote beat caffeinate quick mac 740 ./super-test.sh remote beat caffeinate quick
cygwin 745 ./super-test.sh remote Kenton@flashman quick cygwin 745 ./super-test.sh remote Kenton@flashman quick
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment