From 3c743cb5e24632669b247895ded81e87cc08fa80 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Tue, 22 Jan 2019 12:50:13 -0600 Subject: [PATCH] Moving dagmc_enabled outside of main DAGMC ifdef. --- include/openmc/dagmc.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/include/openmc/dagmc.h b/include/openmc/dagmc.h index 64fb9833c2..4a129ef095 100644 --- a/include/openmc/dagmc.h +++ b/include/openmc/dagmc.h @@ -2,6 +2,10 @@ #ifndef OPENMC_DAGMC_H #define OPENMC_DAGMC_H +namespace openmc { +extern "C" const bool dagmc_enabled; +} + #ifdef DAGMC #include "DagMC.hpp" @@ -10,12 +14,6 @@ namespace openmc { -//============================================================================== -// Global variables -//============================================================================== - -extern "C" const bool dagmc_enabled; - namespace model { extern moab::DagMC* DAG; @@ -30,6 +28,7 @@ extern "C" void load_dagmc_geometry(); extern "C" void free_memory_dagmc(); extern "C" pugi::xml_document* read_uwuw_materials(); bool get_uwuw_materials_xml(std::string& s); + } // namespace openmc #endif // DAGMC