Merge pull request #404 from sandialabs/aprepro-symrec-include

APREPRO: Make symrec definition available in aprepro.h
sandialabs · Sep 25, 2023 · 3d2058a · 3d2058a
2 parents 88558dc + 01a9a2f
commit 3d2058a
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 12 deletions.
diff --git a/packages/seacas/doc-source/aprepro/library.tex b/packages/seacas/doc-source/aprepro/library.tex
@@ -173,7 +173,6 @@ \section{Aprepro Library Test/Example Program}
 #include <fstream>
 #include <iostream>
 
-#include "apr_symrec.h"
 #include "aprepro.h"
 
 // This function is used below in the example showing how an

diff --git a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt b/packages/seacas/libraries/aprepro_lib/CMakeLists.txt
@@ -34,6 +34,7 @@ endif()
 
 SET(HEADERS
   aprepro.h
+  apr_symrec.h
   apr_tokenize.h
 )
 

diff --git a/packages/seacas/libraries/aprepro_lib/apr_aprepro.cc b/packages/seacas/libraries/aprepro_lib/apr_aprepro.cc
@@ -5,7 +5,6 @@
 // See packages/seacas/LICENSE for details
 
 #include "apr_scanner.h" // for Scanner
-#include "apr_symrec.h"
 #include "apr_util.h"
 #include "aprepro.h"        // for Aprepro, symrec, file_rec, etc
 #include "aprepro_parser.h" // for Parser, Parser::token, etc
@@ -35,7 +34,7 @@
 #endif
 
 namespace {
-  const std::string version_string{"6.20 (2023/08/24)"};
+  const std::string version_string{"6.21 (2023/09/25)"};
 
   void output_copyright();
 

diff --git a/packages/seacas/libraries/aprepro_lib/apr_init.cc b/packages/seacas/libraries/aprepro_lib/apr_init.cc
@@ -11,7 +11,6 @@
      Initialize variables and functions Aprepro
 ***/
 #include "apr_builtin.h"
-#include "apr_symrec.h"
 #include "apr_tokenize.h"
 #include "aprepro.h"      // for symrec, Aprepro, etc
 #include "init_structs.h" // for array_a_init, array_c_init, etc

diff --git a/packages/seacas/libraries/aprepro_lib/apr_test.cc b/packages/seacas/libraries/aprepro_lib/apr_test.cc
@@ -7,7 +7,6 @@
 #include <fstream>
 #include <iostream>
 
-#include "apr_symrec.h"
 #include "aprepro.h"
 
 // This function is used below in the example showing how an

diff --git a/packages/seacas/libraries/aprepro_lib/apr_util.cc b/packages/seacas/libraries/aprepro_lib/apr_util.cc
@@ -4,7 +4,6 @@
 //
 // See packages/seacas/LICENSE for details
 
-#include "apr_symrec.h"
 #include "aprepro.h"        // for symrec, Aprepro, etc
 #include "aprepro_parser.h" // for Parser, Parser::token, etc
 
@@ -31,7 +30,7 @@
 #include <windows.h>
 
 #if !defined(S_ISDIR)
-#define S_ISDIR(mode) (((mode)&S_IFMT) == S_IFDIR)
+#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
 
 #endif
 #else

diff --git a/packages/seacas/libraries/aprepro_lib/apr_util.h b/packages/seacas/libraries/aprepro_lib/apr_util.h
@@ -1,17 +1,18 @@
 /*
- * Copyright(C) 1999-2022 National Technology & Engineering Solutions
+ * Copyright(C) 1999-2023 National Technology & Engineering Solutions
  * of Sandia, LLC (NTESS).  Under the terms of Contract DE-NA0003525 with
  * NTESS, the U.S. Government retains certain rights in this software.
  *
  * See packages/seacas/LICENSE for details
  */
 #pragma once
 
-#include "apr_symrec.h"
-#include "aprepro.h"
 #include <string>
 
 namespace SEAMS {
+  struct symrec;
+  class Aprepro;
+
   bool        arg_check(SEAMS::symrec *symbol, bool is_null);
   void        conv_string(char *string);
   void        new_string(const std::string &from, char **to);

diff --git a/packages/seacas/libraries/aprepro_lib/aprepro.h b/packages/seacas/libraries/aprepro_lib/aprepro.h
@@ -18,6 +18,8 @@
 #include <string>
 #include <vector>
 
+#include "apr_symrec.h"
+
 #if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) ||                \
     defined(__MINGW32__) || defined(_WIN64) || defined(__MINGW64__)
 #include <io.h>
@@ -29,8 +31,6 @@
 namespace SEAMS {
 
   struct Symtable;
-  struct symrec;
-  struct array;
 
   /* Global options */
   struct aprepro_options