Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / options / filenameoption.cpp

diff --git a/src/gromacs/options/filenameoption.cpp b/src/gromacs/options/filenameoption.cpp
index a0a4a4023ba0651d14eae89940e5cdcf6eb60450..8c06ea6887f20c904a2fc0fe292d9c883785ddcf 100644 (file)
--- a/src/gromacs/options/filenameoption.cpp
+++ b/src/gromacs/options/filenameoption.cpp
@@ -421,9 +421,9 @@ ConstArrayRef<int> FileNameOptionStorage::fileTypes() const
     const int genericTypeCount = ftp2generic_count(fileType_);
     if (genericTypeCount > 0)
     {
-        return ConstArrayRef<int>(ftp2generic_list(fileType_), genericTypeCount);
+        return constArrayRefFromArray<int>(ftp2generic_list(fileType_), genericTypeCount);
     }
-    return ConstArrayRef<int>(&fileType_, 1);
+    return constArrayRefFromArray<int>(&fileType_, 1);
 }
 
 /********************************************************************