910a2abf86
There were multiple definitions of importPhase(string, string), one per application file. I moved the definition of importPhase to libctxx.a as it had to be in an object file, and I retained the declaration within importPhase.h. I also added declarations for the other functions in libctxx.a into importPhase.h, as they weren't declared anywhere in the interface.
21 lines
436 B
C++
21 lines
436 B
C++
#ifndef CXX_IMPORTPHASE
|
|
#define CXX_IMPORTPHASE
|
|
|
|
#include <string>
|
|
|
|
#include "kernel/ThermoPhase.h"
|
|
#include "kernel/ThermoFactory.h"
|
|
|
|
/*
|
|
* The Definitions for these functions are all located in
|
|
* libctxx.a
|
|
*/
|
|
namespace Cantera {
|
|
ThermoPhase* importPhase(std::string infile, std::string id="");
|
|
|
|
std::string report(const ThermoPhase& th, bool show_thermo);
|
|
std::string formatCompList(const Phase& mix, int xyc);
|
|
}
|
|
|
|
|
|
#endif
|