Fixes Issue 2917, 2918 - cf2vdc failed to copy certain variables (#2925)

* Fixed #2917 Fixed #2918 Wrong virtual method picked up * clang-format pre-push hook
NCAR · Dec 4, 2021 · a5b5009 · a5b5009
1 parent a6a68b7
commit a5b5009
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/apps/cf2vdc/cf2vdc.cpp b/apps/cf2vdc/cf2vdc.cpp
@@ -66,8 +66,8 @@ size_t gcd(size_t n1, size_t n2)
 
 size_t lcm(size_t n1, size_t n2) { return ((n1 * n2) / gcd(n1, n2)); }
 
-int copyVarHelper(DC &dc, VDC &vdc, int fdr, int fdw, vector<size_t> &buffer_dims, vector<size_t> &src_hslice_dims, vector<size_t> &dst_hslice_dims, size_t src_nslice, size_t dst_nslice, double mv,
-                  float *buffer)
+int copyVarHelper(DC &dc, VDCNetCDF &vdc, int fdr, int fdw, vector<size_t> &buffer_dims, vector<size_t> &src_hslice_dims, vector<size_t> &dst_hslice_dims, size_t src_nslice, size_t dst_nslice,
+                  double mv, float *buffer)
 {
     VAssert(buffer_dims.size() == src_hslice_dims.size());
     VAssert(buffer_dims.size() == dst_hslice_dims.size());
@@ -116,7 +116,7 @@ int copyVarHelper(DC &dc, VDC &vdc, int fdr, int fdw, vector<size_t> &buffer_dim
     return (0);
 }
 
-int CopyVar2d3dMask(DC &dc, VDC &vdc, size_t ts, string varname, int lod)
+int CopyVar2d3dMask(DC &dc, VDCNetCDF &vdc, size_t ts, string varname, int lod)
 {
     // Only data variables can have masks
     //