Remove C-style typedefs for structs and enums

Author: sebproell

src/core/io/src/legacy/4C_io_legacy_table.cpp

@@ -904,7 +904,7 @@ MAP* symbol_map(const SYMBOL* symbol)
 
 */
 /*----------------------------------------------------------------------*/
-typedef enum TokenType
+enum TokenType
 {
   tok_none,
   tok_done,
@@ -916,7 +916,7 @@ typedef enum TokenType
   tok_equal,
   tok_indent,
   tok_dedent
-} TOKEN_TYPE;
+};
 
 
 /*----------------------------------------------------------------------*/
@@ -933,14 +933,13 @@ typedef enum TokenType
 /*----------------------------------------------------------------------*/
 struct ParserData
 {
-  TOKEN_TYPE tok;
+  TokenType tok;
   char* token_string;
   int token_int;
   double token_real;
 
   char* file_buffer;
   int file_size;
-  /*char* filename;*/
 
   int pos;
   int lineno;

src/core/io/src/legacy/4C_io_legacy_table_iter.cpp

@@ -17,7 +17,7 @@ FOUR_C_NAMESPACE_OPEN
 
  */
 /*----------------------------------------------------------------------*/
-void init_map_iterator(MAP_ITERATOR* iterator, MAP* map)
+void init_map_iterator(MapIterator* iterator, MAP* map)
 {
   iterator->stack.count = 0;
   iterator->map = map;
@@ -31,11 +31,11 @@ void init_map_iterator(MAP_ITERATOR* iterator, MAP* map)
 
  */
 /*----------------------------------------------------------------------*/
-static void push_map_node(MAP_ITERATOR* iterator, MapNode* map_node)
+static void push_map_node(MapIterator* iterator, MapNode* map_node)
 {
-  STACK_ELEMENT* new_element;
+  StackElement* new_element;
 
-  new_element = new STACK_ELEMENT;
+  new_element = new StackElement;
   new_element->map_node = map_node;
   new_element->snext = iterator->stack.head.snext;
   iterator->stack.head.snext = new_element;
@@ -48,9 +48,9 @@ static void push_map_node(MAP_ITERATOR* iterator, MapNode* map_node)
 
  */
 /*----------------------------------------------------------------------*/
-static void pop_map_node(MAP_ITERATOR* iterator)
+static void pop_map_node(MapIterator* iterator)
 {
-  STACK_ELEMENT* tmp_free;
+  StackElement* tmp_free;
 
   if (iterator->stack.count == 0)
   {
@@ -74,7 +74,7 @@ static void pop_map_node(MAP_ITERATOR* iterator)
 
  */
 /*----------------------------------------------------------------------*/
-int next_map_node(MAP_ITERATOR* iterator)
+int next_map_node(MapIterator* iterator)
 {
   int result = 0;
 
@@ -129,6 +129,6 @@ int next_map_node(MAP_ITERATOR* iterator)
 
  */
 /*----------------------------------------------------------------------*/
-MapNode* iterator_get_node(MAP_ITERATOR* iterator) { return iterator->stack.head.snext->map_node; }
+MapNode* iterator_get_node(MapIterator* iterator) { return iterator->stack.head.snext->map_node; }
 
 FOUR_C_NAMESPACE_CLOSE

src/core/io/src/legacy/4C_io_legacy_table_iter.hpp

@@ -20,11 +20,11 @@ FOUR_C_NAMESPACE_OPEN
 
  */
 /*----------------------------------------------------------------------*/
-typedef struct StackElement
+struct StackElement
 {
   struct StackElement* snext;
   MapNode* map_node;
-} STACK_ELEMENT;
+};
 
 
 /*----------------------------------------------------------------------*/
@@ -33,11 +33,11 @@ typedef struct StackElement
 
  */
 /*----------------------------------------------------------------------*/
-typedef struct Stack
+struct Stack
 {
   int count;
-  STACK_ELEMENT head;
-} STACK;
+  StackElement head;
+};
 
 
 /*----------------------------------------------------------------------*/
@@ -49,18 +49,18 @@ typedef struct Stack
 
  */
 /*----------------------------------------------------------------------*/
-typedef struct MapIterator
+struct MapIterator
 {
   MAP* map;
-  STACK stack;
-} MAP_ITERATOR;
+  Stack stack;
+};
 
 
-void init_map_iterator(MAP_ITERATOR* iterator, MAP* map);
+void init_map_iterator(MapIterator* iterator, MAP* map);
 
-int next_map_node(MAP_ITERATOR* iterator);
+int next_map_node(MapIterator* iterator);
 
-MapNode* iterator_get_node(MAP_ITERATOR* iterator);
+MapNode* iterator_get_node(MapIterator* iterator);
 
 FOUR_C_NAMESPACE_CLOSE
 

src/fsi/src/4C_fsi_dyn.cpp

@@ -480,7 +480,7 @@ void fsi_ale_drt()
 
   const Teuchos::ParameterList& fsidyn = problem->fsi_dynamic_params();
 
-  auto coupling = Teuchos::getIntegralValue<FSI_COUPLING>(fsidyn, "COUPALGO");
+  auto coupling = Teuchos::getIntegralValue<FsiCoupling>(fsidyn, "COUPALGO");
   switch (coupling)
   {
     case fsi_iter_monolithicfluidsplit:

src/inpar/4C_inpar_bio.hpp

@@ -29,12 +29,12 @@ namespace Core::Conditions
 This is the enumeration of all types of different integration schemes
 
 *-----------------------------------------------------------------------*/
-typedef enum RedAirwaysDyntype
+enum RedAirwaysDyntype
 {
   one_step_theta,
   linear,
   nonlinear
-} _RED_AIRWAYS_DYNTYPE;
+};
 
 
 namespace Inpar

src/inpar/4C_inpar_fsi.hpp

@@ -26,7 +26,7 @@ namespace Core::Conditions
 /*----------------------------------------------------------------------*/
 /* The coupling methods for FSI. */
 /*----------------------------------------------------------------------*/
-typedef enum FsiCoupling
+enum FsiCoupling
 {
   fsi_coupling_freesurface = -1,
   fsi_coupling_undefined = 0,
@@ -57,7 +57,7 @@ typedef enum FsiCoupling
   fsi_iter_sliding_monolithicfluidsplit,
   fsi_iter_sliding_monolithicstructuresplit,
   fsi_iter_mortar_monolithicfluidsplit_saddlepoint
-} FSI_COUPLING;
+};
 
 namespace Inpar
 {

src/mat/elast/4C_mat_elast_aniso_structuraltensor_strategy.hpp

@@ -24,20 +24,20 @@ namespace Mat
   {
     namespace PAR
     {
-      typedef enum DistrType
+      enum DistrType
       {
         distr_type_undefined = 0,
         distr_type_vonmisesfisher = 1,
         distr_type_bingham = 2
-      } DISTR_TYPE_;
+      };
 
-      typedef enum StrategyType
+      enum StrategyType
       {
         strategy_type_undefined = 0,
         strategy_type_standard = 1,
         strategy_type_bydistributionfunction = 2,
         strategy_type_dispersedtransverselyisotropic = 3
-      } STRATEGY_TYPE_;
+      };
 
       /*!
        * @brief material parameters for generalized structural tensor with distribution

src/post/4C_post_filter_base.cpp

@@ -47,7 +47,7 @@ void PostFilterBase::write_any_results(PostField* field, const char* type, const
   PostResult result = PostResult(field);
   result.next_result();
 
-  MAP_ITERATOR iter;
+  MapIterator iter;
   init_map_iterator(&iter, result.group());
 
   while (next_map_node(&iter))