Merge commit d30f2cb6 from release-2020 into master

[alexxy/gromacs.git] / src / gromacs / mdtypes / state_propagator_data_gpu_impl.cpp

diff --git a/src/gromacs/mdtypes/state_propagator_data_gpu_impl.cpp b/src/gromacs/mdtypes/state_propagator_data_gpu_impl.cpp
index 9b201b9376f2d35aa5f85af8b0a7c5a1966c08f8..ae6bcd6c71eef3d217c1c46e46c79604d7078caf 100644 (file)
--- a/src/gromacs/mdtypes/state_propagator_data_gpu_impl.cpp
+++ b/src/gromacs/mdtypes/state_propagator_data_gpu_impl.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2019, by the GROMACS development team, led by
+ * Copyright (c) 2019,2020, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -59,7 +59,8 @@ StatePropagatorDataGpu::StatePropagatorDataGpu(const void* /* pmeStream       */
                                                const void* /* nonLocalStream  */,
                                                const void* /* deviceContext   */,
                                                GpuApiCallBehavior /* transferKind    */,
-                                               int /* paddingSize     */) :
+                                               int /* paddingSize     */,
+                                               gmx_wallcycle* /*   wcycle */) :
     impl_(nullptr)
 {
 }
@@ -67,7 +68,8 @@ StatePropagatorDataGpu::StatePropagatorDataGpu(const void* /* pmeStream       */
 StatePropagatorDataGpu::StatePropagatorDataGpu(const void* /* pmeStream       */,
                                                const void* /* deviceContext   */,
                                                GpuApiCallBehavior /* transferKind    */,
-                                               int /* paddingSize     */) :
+                                               int /* paddingSize     */,
+                                               gmx_wallcycle* /*   wcycle */) :
     impl_(nullptr)
 {
 }