@@ -393,7 +393,9 @@ typedef enum cpp0x_warn_str
/* defaulted and deleted functions */
CPP0X_DEFAULTED_DELETED,
/* inline namespaces */
- CPP0X_INLINE_NAMESPACES
+ CPP0X_INLINE_NAMESPACES,
+ /* override controls, override/final */
+ CPP0X_OVERRIDE_CONTROLS
} cpp0x_warn_str;
/* The various kinds of operation used by composite_pointer_type. */
@@ -3227,6 +3227,11 @@ maybe_warn_cpp0x (cpp0x_warn_str str)
"inline namespaces "
"only available with -std=c++0x or -std=gnu++0x");
break;
+ case CPP0X_OVERRIDE_CONTROLS:
+ pedwarn (input_location, 0,
+ "override controls (override/final) "
+ "only available with -std=c++0x or -std=gnu++0x");
+ break;
default:
gcc_unreachable();
}
@@ -15596,9 +15596,19 @@ cp_parser_virt_specifier_seq_opt (cp_parser* parser)
if (token->type != CPP_NAME)
break;
if (!strcmp (IDENTIFIER_POINTER(token->u.value), "override"))
- virt_specifier = VIRT_SPEC_OVERRIDE;
+ {
+ maybe_warn_cpp0x (CPP0X_OVERRIDE_CONTROLS);
+ virt_specifier = VIRT_SPEC_OVERRIDE;
+ }
else if (!strcmp (IDENTIFIER_POINTER(token->u.value), "final"))
- virt_specifier = VIRT_SPEC_FINAL;
+ {
+ maybe_warn_cpp0x (CPP0X_OVERRIDE_CONTROLS);
+ virt_specifier = VIRT_SPEC_FINAL;
+ }
+ else if (!strcmp (IDENTIFIER_POINTER(token->u.value), "__final"))
+ {
+ virt_specifier = VIRT_SPEC_FINAL;
+ }
else
break;
@@ -1,4 +1,5 @@
// { dg-do compile }
+// { dg-options "--std=c++0x" }
struct B
{
virtual void f() final {}
new file mode 100644
@@ -0,0 +1,24 @@
+// { dg-do compile }
+// { dg-options "--std=c++98" }
+
+struct B final {}; // { dg-warning "only available with -std=c++0x or -std=gnu++0x" }
+
+struct D : B {}; // { dg-error "cannot derive from ‘final’ base" }
+
+struct E __final {};
+
+struct F : E {}; { dg-error "cannot derive from ‘final’ base" }
+
+struct G
+{
+ virtual void f();
+};
+
+struct H : G
+{
+ void f() override; // { dg-warning "only available with -std=c++0x or -std=gnu++0x" }
+};
+
+int main()
+{
+}