Fix modernize-use-using

src/MeshBlock.h

@@ -45,7 +45,7 @@
 #define HOLE 0
 #define FIELD 1
 
 class MeshBlock
 {
 private:
     /** Mesh block info provided by the application code
@@ -277,9 +277,9 @@
     };
 
     /** basic destructor */
     ~MeshBlock();
 
     void preprocess(int use_adaptholemap);
 
     void tagBoundary(void);
 
@@ -287,11 +287,11 @@
 
     void writeGridFile(int bid);
 
     void writeFlowFile(int bid, double* q, int nvar, int type);
 
     void setData(TIOGA::MeshBlockInfo* minfo);
 
     void setData(
         int btag,
         int nnodesi,
         double* xyzi,
@@ -307,19 +307,19 @@
         uint64_t* cell_gid = nullptr,
         uint64_t* node_gid = nullptr);
 
     void setResolutions(double* nres, double* cres);
 
     void search();
     void search_uniform_hex();
     void writeOBB(int bid);
 
     void writeOBB2(OBB* obc, int bid);
 
     void updateSolnData(int inode, double* qvar, double* q);
 
     int getNinterp(void) { return ninterp; };
 
     void getInterpolatedSolution(
         int* nints,
         int* nreals,
         int** intData,
@@ -328,7 +328,7 @@
         int nvar,
         int interptype);
 
     void getInterpolatedSolutionAMR(
         int* nints,
         int* nreals,
         int** intData,
@@ -391,7 +391,7 @@
     void insertAndSort(
         int pointid,
         int senderid,
-        int meshtag,
+        int meshtagdonor,
         int remoteid,
         double donorRes,
         double receptorRes);

src/codetypes.h

@@ -33,7 +33,7 @@
 /*  Floating point definition                                         */
 /*====================================================================*/
 #define REAL double
-typedef int32_t qcoord_t;
+using qcoord_t = int32_t;
 /*====================================================================*/
 /*  Base for indexing (0 or 1) */
 /*====================================================================*/
@@ -151,21 +151,21 @@
     };
 };
 
-typedef struct
+using bound_t = struct
 {
     double lo; /**< lower bound */
     double hi; /**< upper bound */
-} bound_t;
+};
 
-typedef struct
+using box_t = struct
 {
     bound_t x; /**< x bounds */
     bound_t y; /**< y bounds */
     bound_t z; /**< z bounds */
-} box_t;
+};
 
 /** The 3D full octant datatype: 130 bytes per octant */
-typedef struct octant_full
+using octant_full_t = struct octant_full
 {
     qcoord_t x, y, z; /**< [12B] binary coordinates */
     uint32_t id;      /**< [4B] element id on level */
@@ -174,96 +174,96 @@
     uint8_t refined;  /**< [1B] flag if refined (i.e. is a parent) */
     struct octant_full* nhbr[6];     /**< [48B] neighbor octant list */
     struct octant_full* children[8]; /**< [64B] children octants if refined */
-} octant_full_t;
+};
 
-typedef struct octant_coordinates
+using octant_coordinates_t = struct octant_coordinates
 {
     qcoord_t x, y, z; /**< [12B] binary coordinates */
-} octant_coordinates_t;
+};
 
 /** 3D octant datatype: 48 bytes per octant */
-typedef struct octant
+using octant_t = struct octant
 {
     qcoord_t x, y, z; /**< [12B] binary coordinates */
     uint8_t filltype; /**< [1B]  floodfill: [0] inside SB, [1] outside SB, [2]
                          hole SB */
     uint8_t leafflag; /**< [1B]  flag if refined (i.e. is a parent) */
     uint8_t pad[2];   /**< [2B]  padding */
     uint32_t children[8]; /**< [32B] children octant IDs */
-} octant_t;
+};
 
-typedef struct level_octant
+using level_octant_t = struct level_octant
 {
     uint32_t elem_count; /**< number of octants in level */
     uint8_t level_id;    /**< level number */
     std::vector<octant_full_t>
         octants; /**< [elem_count] locally stored octants */
-} level_octant_t;
+};
 
-typedef struct level_octant_coordinate
+using level_octant_coordinate_t = struct level_octant_coordinate
 {
     uint8_t level_id;    /**< level number */
     uint32_t elem_count; /**< number of octants in level */
     std::vector<octant_coordinates_t> octants; /**< [elem_count] octant list */
-} level_octant_coordinate_t;
+};
 
-typedef struct level
+using level_t = struct level
 {
     uint8_t level_id;              /**< level number */
     uint32_t elem_count;           /**< number of octants in level */
     std::vector<octant_t> octants; /**< [elem_count] octant list */
-} level_t;
+};
 
-typedef struct ADAPTIVE_HOLEMAP_OCTANT
+using ADAPTIVE_HOLEMAP_OCTANT = struct ADAPTIVE_HOLEMAP_OCTANT
 {
     int8_t existWall;     /**< flag to indicate map contains wall */
     double extents_lo[3]; /**< lower coordinates of tree */
     double extents_hi[3]; /**< upper coordinates of tree */
 
     uint8_t nlevel; /**< number of levels */
     level_octant_t levels[OCTANT_MAXLEVEL];
-} ADAPTIVE_HOLEMAP_OCTANT;
+};
 
-typedef struct
+using ahm_meta_t = struct
 {
     uint8_t nlevel;       /**< number of levels in map */
     double extents_lo[3]; /**< lower coordinates of tree */
     double extents_hi[3]; /**< upper coordinates of tree */
     uint64_t leaf_count;  /**< total leaf octant count */
     uint64_t elem_count;  /**< total octant count */
-} ahm_meta_t;
+};
 
-typedef struct
+using ahm_meta_minimal_t = struct
 {
     uint8_t nlevel;       /**< number of levels in map */
     double extents_lo[3]; /**< lower coordinates of tree */
     double extents_hi[3]; /**< upper coordinates of tree */
     uint64_t elem_count;  /**< total octant count */
-} ahm_meta_minimal_t;
+};
 
-typedef struct ADAPTIVE_HOLEMAP_COMPOSITE
+using ADAPTIVE_HOLEMAP_COMPOSITE = struct ADAPTIVE_HOLEMAP_COMPOSITE
 {
     ahm_meta_minimal_t meta; /**< adaptive hole map meta data */
     level_octant_coordinate_t levels[OCTANT_MAXLEVEL];
-} ADAPTIVE_HOLEMAP_COMPOSITE;
+};
 
-typedef struct ADAPTIVE_HOLEMAP
+using ADAPTIVE_HOLEMAP = struct ADAPTIVE_HOLEMAP
 {
     uint8_t existWall; /**< flag to indicate map contains wall */
     ahm_meta_t meta;   /**< adaptive hole map meta data */
     level_t levels[OCTANT_MAXLEVEL];
-} ADAPTIVE_HOLEMAP;
+};
 
-typedef struct HOLEMAP
+using HOLEMAP = struct HOLEMAP
 {
     int existWall;
     int nx[3];
     int* samLocal;
     int* sam;
     double extents[6];
-} HOLEMAP;
+};
 
-typedef struct OBB
+using OBB = struct OBB
 {
     double xc[3];
     double dxc[3];
@@ -275,64 +275,64 @@
     int tag_remote;
     int send_tag;
     int recv_tag;
-} OBB;
+};
 
-typedef struct DONORLIST
+using DONORLIST = struct DONORLIST
 {
     int donorData[4];
     double donorRes;
     double receptorRes;
     int cancel;
     struct DONORLIST* next;
-} DONORLIST;
+};
 
-typedef struct PACKET
+using PACKET = struct PACKET
 {
     int nints;
     int nreals;
     int* intData;
     REAL* realData;
-} PACKET;
+};
 
-typedef struct INTERPLIST
+using INTERPLIST = struct INTERPLIST
 {
     int cancel;
     int nweights;
     int receptorInfo[3];
     double xtmp[3];
     int* inode;
     double* weights;
-} INTERPLIST;
+};
 
-typedef struct INTERPLIST2
+using INTERPLIST2 = struct INTERPLIST2
 {
     int cancel;
     int nweights;
     int receptorInfo[3];
     int* inode;
     double* weights;
     struct INTERPLIST2* next;
-} INTERPLIST2;
+};
 
-typedef struct INTEGERLIST
+using INTEGERLIST = struct INTEGERLIST
 {
     int inode;
     struct INTEGERLIST* next;
-} INTEGERLIST;
+};
 
-typedef struct INTEGERLIST2
+using INTEGERLIST2 = struct INTEGERLIST2
 {
     int intDataSize, realDataSize;
     int* intData;
     double* realData;
     struct INTEGERLIST2* next;
-} INTEGERLIST2;
+};
 
-typedef struct CompositeBody
+using CompositeBody = struct CompositeBody
 {
     double searchTol;
     std::vector<int> bodyids;
     std::vector<int> dominanceflags;
-} CompositeBody;
+};
 
 #endif /* CODETYPES_H */

src/globals.h

@@ -33,12 +33,12 @@ tioga* tg;
 ** pointer storage for connectivity arrays that
 ** comes from external solver
 */
-typedef struct inpdata
+using inpdata = struct inpdata
 {
     int** vconn;
     int* nc;
     int* nv;
-} inpdata;
+};
 inpdata idata[MAXBLOCKS];
 
 #endif /* GLOBALS_H */