Refactor classes for atomic types

- make ctors all inline - use intermediate class `NcAtomic` to reduce duplication of equality operator - now classes are only a few lines each, move them all into `ncType.h` header
Unidata · Jan 4, 2024 · 0a6d0f1 · 0a6d0f1
1 parent ec6394c
commit 0a6d0f1
Show file tree

Hide file tree

Showing 34 changed files with 122 additions and 594 deletions.
diff --git a/cxx4/ncByte.cpp b/cxx4/ncByte.cpp
diff --git a/cxx4/ncByte.h b/cxx4/ncByte.h
diff --git a/cxx4/ncChar.cpp b/cxx4/ncChar.cpp
diff --git a/cxx4/ncChar.h b/cxx4/ncChar.h
diff --git a/cxx4/ncCompoundType.cpp b/cxx4/ncCompoundType.cpp
@@ -1,18 +1,6 @@
 #include "ncGroup.h"
 #include "ncCheck.h"
 #include "ncCompoundType.h"
-#include "ncByte.h"
-#include "ncUbyte.h"
-#include "ncChar.h"
-#include "ncShort.h"
-#include "ncUshort.h"
-#include "ncInt.h"
-#include "ncUint.h"
-#include "ncInt64.h"
-#include "ncUint64.h"
-#include "ncFloat.h"
-#include "ncDouble.h"
-#include "ncString.h"
 #include "ncException.h"
 
 using namespace std;

diff --git a/cxx4/ncDouble.cpp b/cxx4/ncDouble.cpp
diff --git a/cxx4/ncDouble.h b/cxx4/ncDouble.h
diff --git a/cxx4/ncEnumType.cpp b/cxx4/ncEnumType.cpp
@@ -1,18 +1,6 @@
 #include "ncEnumType.h"
 #include "ncGroup.h"
 #include "ncCheck.h"
-#include "ncByte.h"
-#include "ncUbyte.h"
-#include "ncChar.h"
-#include "ncShort.h"
-#include "ncUshort.h"
-#include "ncInt.h"
-#include "ncUint.h"
-#include "ncInt64.h"
-#include "ncUint64.h"
-#include "ncFloat.h"
-#include "ncDouble.h"
-#include "ncString.h"
 #include "ncException.h"
 using namespace std;
 using namespace netCDF;

diff --git a/cxx4/ncFile.cpp b/cxx4/ncFile.cpp
@@ -1,7 +1,6 @@
 #include "ncFile.h"
 #include "ncCheck.h"
 #include "ncException.h"
-#include "ncByte.h"
 #include<iostream>
 #include<string>
 #include<sstream>

diff --git a/cxx4/ncFloat.cpp b/cxx4/ncFloat.cpp
diff --git a/cxx4/ncFloat.h b/cxx4/ncFloat.h
diff --git a/cxx4/ncGroup.cpp b/cxx4/ncGroup.cpp
@@ -5,18 +5,7 @@
 #include "ncCompoundType.h"
 #include "ncOpaqueType.h"
 #include "ncGroupAtt.h"
-#include "ncByte.h"
-#include "ncUbyte.h"
-#include "ncChar.h"
-#include "ncShort.h"
-#include "ncUshort.h"
-#include "ncInt.h"
-#include "ncUint.h"
-#include "ncInt64.h"
-#include "ncUint64.h"
-#include "ncFloat.h"
-#include "ncDouble.h"
-#include "ncString.h"
+
 #include <cstddef>
 #include <ncException.h>
 #include "ncCheck.h"
@@ -1237,7 +1226,7 @@ NcEnumType NcGroup::addEnumType(const string& name,NcEnumType::ncEnumType baseTy
 
 
 // Adds a new netCDF Vlen type.
-NcVlenType NcGroup::addVlenType(const string& name,NcType& baseType) const {
+NcVlenType NcGroup::addVlenType(const string& name, const NcType& baseType) const {
   ncCheckDefineMode(myId);
   nc_type typeId;
   ncCheck(nc_def_vlen(myId, name.c_str(), baseType.getId(),&typeId),__FILE__,__LINE__);

diff --git a/cxx4/ncGroup.h b/cxx4/ncGroup.h
@@ -511,7 +511,7 @@ namespace netCDF
       \param basetype    A NcType object to be used for the basetype.
       \return            The NcVlenType object for this new netCDF vlen type.
     */
-    NcVlenType addVlenType(const std::string& name,NcType& basetype) const;
+    NcVlenType addVlenType(const std::string& name, const NcType& basetype) const;
 
 
     /*!

diff --git a/cxx4/ncInt.cpp b/cxx4/ncInt.cpp
diff --git a/cxx4/ncInt.h b/cxx4/ncInt.h
diff --git a/cxx4/ncInt64.cpp b/cxx4/ncInt64.cpp
diff --git a/cxx4/ncInt64.h b/cxx4/ncInt64.h
diff --git a/cxx4/ncShort.cpp b/cxx4/ncShort.cpp