[Fortran] Fix for multiple definitions of '_xml' function
This was causing linker errors when trying to link with the Fortran library.
This commit is contained in:
parent
1183479f88
commit
f0e6d090dc
2 changed files with 8 additions and 0 deletions
|
|
@ -26,6 +26,8 @@ typedef Cabinet<Transport> TransportCabinet;
|
||||||
|
|
||||||
typedef integer status_t;
|
typedef integer status_t;
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
XML_Node* _xml(const integer* n)
|
XML_Node* _xml(const integer* n)
|
||||||
{
|
{
|
||||||
return &XmlCabinet::item(*n);
|
return &XmlCabinet::item(*n);
|
||||||
|
|
@ -51,6 +53,8 @@ Transport* _ftrans(const integer* n)
|
||||||
return &TransportCabinet::item(*n);
|
return &TransportCabinet::item(*n);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // unnamed namespace
|
||||||
|
|
||||||
std::string f2string(const char* s, ftnlen n)
|
std::string f2string(const char* s, ftnlen n)
|
||||||
{
|
{
|
||||||
int k;
|
int k;
|
||||||
|
|
|
||||||
|
|
@ -23,11 +23,15 @@ template<> XmlCabinet* XmlCabinet::s_storage = 0;
|
||||||
|
|
||||||
typedef integer status_t;
|
typedef integer status_t;
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
XML_Node* _xml(const integer* i)
|
XML_Node* _xml(const integer* i)
|
||||||
{
|
{
|
||||||
return &XmlCabinet::item(*i);
|
return &XmlCabinet::item(*i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // unnamed namespace
|
||||||
|
|
||||||
std::string f2string(const char* s, ftnlen n);
|
std::string f2string(const char* s, ftnlen n);
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue