Merge branch 'origin/release-2020' into master

[alexxy/gromacs.git] / src / gromacs / options / optionstoragetemplate.h

diff --git a/src/gromacs/options/optionstoragetemplate.h b/src/gromacs/options/optionstoragetemplate.h
index 482ba62f59832bdf05de75d363c8756668c30c72..0ec97a877cd36ced66847a4d3f98229c446c88bd 100644 (file)
--- a/src/gromacs/options/optionstoragetemplate.h
+++ b/src/gromacs/options/optionstoragetemplate.h
@@ -560,7 +560,7 @@ void OptionStorageTemplate<T>::commitValues()
     {
         store_->append(value);
     }
-    DIAGNOSTIC_RESET;
+    CLANG_DIAGNOSTIC_RESET;
     clearSet();
 }