Skip to content

Commit

Permalink
IOSS: A few more include fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
gsjaardema committed Nov 21, 2023
1 parent ab02d93 commit 7a597be
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ inline std::string IOSS_SYM_TENSOR() { return {"sym_tensor_33"}; }
/* #undef SEACAS_HAVE_FAODEL */
#define SEACAS_HAVE_PAMGEN
#else
#include <SEACASIoss_config.h>
#include "SEACASIoss_config.h"
#endif

#if defined(IOSS_THREADSAFE)
Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
#endif

#if defined(SEACAS_HAVE_CATALYST2)
#include <catalyst/Iocatalyst_Initializer.h>
#include "catalyst/Iocatalyst_Initializer.h"
#endif

#if defined(SEACAS_HAVE_PAMGEN)
#include "pamgen/Iopg_DatabaseIO.h"
#endif

#if defined(SEACAS_HAVE_FAODEL)
#include <faodel/Iofaodel_DatabaseIO.h>
#include "faodel/Iofaodel_DatabaseIO.h"
#endif

#if defined(SEACAS_HAVE_CGNS)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// 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

#include "IossApplication.h"
#include "CatalystPluginPaths.h"
#include "Ionit_Initializer.h"
#include "IossRegionReport.h"
#include "Ioss_CopyDatabase.h"
#include "Ioss_DatabaseIO.h"
Expand All @@ -14,7 +15,6 @@
#include "Ioss_MeshCopyOptions.h"
#include "Ioss_Region.h"
#include "Ioss_Utils.h"
#include <Ionit_Initializer.h>
#include <cstdlib>
#include <fstream>
#include <iomanip>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "Ioss_Utils.h"
#include "visualization/utils/Iovs_CatalystLogging.h"
#include <fstream>
#include <iostream>
#include <time.h>
#include <visualization/utils/Iovs_CatalystLogging.h>

namespace Iovs {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "visualization/utils/Iovs_CatalystVersion.h"
#include <iostream>
#include <sstream>
#include <vector>
#include <visualization/utils/Iovs_CatalystVersion.h>

namespace Iovs {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +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

#include "Ioss_CodeTypes.h"
#include "Ioss_Utils.h"
#include "visualization/utils/Iovs_CatalystLogging.h"
#include "visualization/utils/Iovs_CatalystVersion.h"
#include "visualization/utils/Iovs_Utils.h"
#include <cstring>
#include <fstream>
#include <iostream>
#include <sstream>
#include <visualization/utils/Iovs_CatalystLogging.h>
#include <visualization/utils/Iovs_CatalystVersion.h>
#include <visualization/utils/Iovs_Utils.h>

#if defined(__IOSS_WINDOWS__)
#ifndef NOMINMAX
Expand Down

0 comments on commit 7a597be

Please sign in to comment.