From f0e6d090dc55d69d679d1b8fa3fb9431ea20fa7e Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 24 Feb 2016 18:41:25 -0500 Subject: [PATCH] [Fortran] Fix for multiple definitions of '_xml' function This was causing linker errors when trying to link with the Fortran library. --- src/fortran/fct.cpp | 4 ++++ src/fortran/fctxml.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/fortran/fct.cpp b/src/fortran/fct.cpp index e6ef008578..7ee84de4cb 100644 --- a/src/fortran/fct.cpp +++ b/src/fortran/fct.cpp @@ -26,6 +26,8 @@ typedef Cabinet TransportCabinet; typedef integer status_t; +namespace { + XML_Node* _xml(const integer* n) { return &XmlCabinet::item(*n); @@ -51,6 +53,8 @@ Transport* _ftrans(const integer* n) return &TransportCabinet::item(*n); } +} // unnamed namespace + std::string f2string(const char* s, ftnlen n) { int k; diff --git a/src/fortran/fctxml.cpp b/src/fortran/fctxml.cpp index 263a789349..41c1ffd4cb 100644 --- a/src/fortran/fctxml.cpp +++ b/src/fortran/fctxml.cpp @@ -23,11 +23,15 @@ template<> XmlCabinet* XmlCabinet::s_storage = 0; typedef integer status_t; +namespace { + XML_Node* _xml(const integer* i) { return &XmlCabinet::item(*i); } +} // unnamed namespace + std::string f2string(const char* s, ftnlen n); extern "C" {