diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 75ab456362b..1f84d8776d0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-13  Jonathan Wakely  <jwakely@redhat.com>
+
+	* opt-problem.h (opt_wrapper): Use template-argument-list when naming
+	the base class, because using the injected-class-name was not clearly
+	specified until DR 176.
+
 2018-10-12  Paul Koning  <ni1d@arrl.net>
 
 	* config/pdp11/pdp11.md (doloop_end): New expander.
diff --git a/gcc/opt-problem.h b/gcc/opt-problem.h
index 68d7e4a5f7b..55d0ff024f7 100644
--- a/gcc/opt-problem.h
+++ b/gcc/opt-problem.h
@@ -214,7 +214,7 @@ class opt_result : public opt_wrapper <bool>
   /* Private ctor.  Instances should be created by the success and failure
      static member functions.  */
   opt_result (wrapped_t result, opt_problem *problem)
-  : opt_wrapper (result, problem)
+  : opt_wrapper <bool> (result, problem)
   {}
 };