Commit 330e3fc7 authored by Kenton Varda's avatar Kenton Varda

Fix build on GCC 4.7.

parent 4692a669
...@@ -1146,6 +1146,8 @@ NodeTranslator::BrandedDecl NodeTranslator::BrandScope::decompileType( ...@@ -1146,6 +1146,8 @@ NodeTranslator::BrandedDecl NodeTranslator::BrandScope::decompileType(
KJ_UNREACHABLE; KJ_UNREACHABLE;
} }
} }
KJ_UNREACHABLE;
} }
kj::Maybe<NodeTranslator::BrandedDecl> NodeTranslator::BrandScope::compileDeclExpression( kj::Maybe<NodeTranslator::BrandedDecl> NodeTranslator::BrandScope::compileDeclExpression(
...@@ -1252,6 +1254,8 @@ kj::Maybe<NodeTranslator::BrandedDecl> NodeTranslator::BrandScope::compileDeclEx ...@@ -1252,6 +1254,8 @@ kj::Maybe<NodeTranslator::BrandedDecl> NodeTranslator::BrandScope::compileDeclEx
} }
} }
} }
KJ_UNREACHABLE;
} }
// ======================================================================================= // =======================================================================================
...@@ -1270,7 +1274,7 @@ NodeTranslator::NodeTranslator( ...@@ -1270,7 +1274,7 @@ NodeTranslator::NodeTranslator(
compileNode(decl, wipNode.get()); compileNode(decl, wipNode.get());
} }
NodeTranslator::~NodeTranslator() {} NodeTranslator::~NodeTranslator() noexcept(false) {}
NodeTranslator::NodeSet NodeTranslator::getBootstrapNode() { NodeTranslator::NodeSet NodeTranslator::getBootstrapNode() {
auto nodeReader = wipNode.getReader(); auto nodeReader = wipNode.getReader();
......
...@@ -121,7 +121,7 @@ public: ...@@ -121,7 +121,7 @@ public:
// `displayName`, `id`, `scopeId`, and `nestedNodes` already initialized. The `NodeTranslator` // `displayName`, `id`, `scopeId`, and `nestedNodes` already initialized. The `NodeTranslator`
// fills in the rest. // fills in the rest.
~NodeTranslator(); ~NodeTranslator() noexcept(false);
struct NodeSet { struct NodeSet {
schema::Node::Reader node; schema::Node::Reader node;
......
...@@ -692,6 +692,11 @@ ListSchema ListSchema::of(schema::Type::Which primitiveType) { ...@@ -692,6 +692,11 @@ ListSchema ListSchema::of(schema::Type::Which primitiveType) {
} }
ListSchema ListSchema::of(schema::Type::Reader elementType, Schema context) { ListSchema ListSchema::of(schema::Type::Reader elementType, Schema context) {
// This method is deprecated because it can only be implemented in terms of other deprecated
// methods. Temporarily disable warnings for those other deprecated methods.
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
switch (elementType.which()) { switch (elementType.which()) {
case schema::Type::VOID: case schema::Type::VOID:
case schema::Type::BOOL: case schema::Type::BOOL:
...@@ -728,6 +733,7 @@ ListSchema ListSchema::of(schema::Type::Reader elementType, Schema context) { ...@@ -728,6 +733,7 @@ ListSchema ListSchema::of(schema::Type::Reader elementType, Schema context) {
// Unknown type is acceptable. // Unknown type is acceptable.
return ListSchema(elementType.which()); return ListSchema(elementType.which());
#pragma GCC diagnostic pop
} }
StructSchema ListSchema::getStructElementType() const { StructSchema ListSchema::getStructElementType() const {
......
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