From 84378f8ae27fe4c181e0f676910fea3fbd9df940 Mon Sep 17 00:00:00 2001
From: Lars Pastewka <lars.pastewka@imtek.uni-freiburg.de>
Date: Sun, 1 Oct 2017 14:05:12 +0200
Subject: [PATCH] MAINT: Renamed _put_var1_x to _put_var1_bigint

---
 src/USER-NETCDF/dump_netcdf.cpp       | 14 ++++----------
 src/USER-NETCDF/dump_netcdf_mpiio.cpp | 15 ++++-----------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/USER-NETCDF/dump_netcdf.cpp b/src/USER-NETCDF/dump_netcdf.cpp
index 3193f3c365..aa2a4700a3 100644
--- a/src/USER-NETCDF/dump_netcdf.cpp
+++ b/src/USER-NETCDF/dump_netcdf.cpp
@@ -608,26 +608,20 @@ void DumpNetCDF::closefile()
 /* ---------------------------------------------------------------------- */
 
 template <typename T>
-int nc_put_var1_x(int ncid, int varid, const size_t index[], const T* tp)
-{
-  return nc_put_var1_double(ncid, varid, index, tp);
-}
-
-template <>
-int nc_put_var1_x<int>(int ncid, int varid, const size_t index[], const int* tp)
+int nc_put_var1_bigint(int ncid, int varid, const size_t index[], const T* tp)
 {
   return nc_put_var1_int(ncid, varid, index, tp);
 }
 
 template <>
-int nc_put_var1_x<long>(int ncid, int varid, const size_t index[],
+int nc_put_var1_bigint<long>(int ncid, int varid, const size_t index[],
                         const long* tp)
 {
   return nc_put_var1_long(ncid, varid, index, tp);
 }
 
 template <>
-int nc_put_var1_x<long long>(int ncid, int varid, const size_t index[],
+int nc_put_var1_bigint<long long>(int ncid, int varid, const size_t index[],
                              const long long* tp)
 {
   return nc_put_var1_longlong(ncid, varid, index, tp);
@@ -664,7 +658,7 @@ void DumpNetCDF::write()
                   th->keyword[i] );
         }
         else if (th->vtype[i] == BIGINT) {
-          NCERRX( nc_put_var1_x(ncid, thermovar[i], start, &th->bivalue),
+          NCERRX( nc_put_var1_bigint(ncid, thermovar[i], start, &th->bivalue),
                   th->keyword[i] );
         }
       }
diff --git a/src/USER-NETCDF/dump_netcdf_mpiio.cpp b/src/USER-NETCDF/dump_netcdf_mpiio.cpp
index 656da1b6df..e054772c41 100644
--- a/src/USER-NETCDF/dump_netcdf_mpiio.cpp
+++ b/src/USER-NETCDF/dump_netcdf_mpiio.cpp
@@ -584,28 +584,21 @@ void DumpNetCDFMPIIO::closefile()
 /* ---------------------------------------------------------------------- */
 
 template <typename T>
-int ncmpi_put_var1_x(int ncid, int varid, const MPI_Offset index[],
+int ncmpi_put_var1_bigint(int ncid, int varid, const MPI_Offset index[],
                      const T* tp)
-{
-  return ncmpi_put_var1_double(ncid, varid, index, tp);
-}
-
-template <>
-int ncmpi_put_var1_x<int>(int ncid, int varid, const MPI_Offset index[],
-                          const int* tp)
 {
   return ncmpi_put_var1_int(ncid, varid, index, tp);
 }
 
 template <>
-int ncmpi_put_var1_x<long>(int ncid, int varid, const MPI_Offset index[],
+int ncmpi_put_var1_bigint<long>(int ncid, int varid, const MPI_Offset index[],
                            const long* tp)
 {
   return ncmpi_put_var1_long(ncid, varid, index, tp);
 }
 
 template <>
-int ncmpi_put_var1_x<long long>(int ncid, int varid, const MPI_Offset index[],
+int ncmpi_put_var1_bigint<long long>(int ncid, int varid, const MPI_Offset index[],
                                 const long long* tp)
 {
   return ncmpi_put_var1_longlong(ncid, varid, index, tp);
@@ -644,7 +637,7 @@ void DumpNetCDFMPIIO::write()
                   th->keyword[i] );
         }
         else if (th->vtype[i] == BIGINT) {
-          NCERRX( ncmpi_put_var1_x(ncid, thermovar[i], start, &th->bivalue),
+          NCERRX( ncmpi_put_var1_bigint(ncid, thermovar[i], start, &th->bivalue),
                   th->keyword[i] );
         }
       }