Commit a2660391 authored by Martin Marinov's avatar Martin Marinov

Merge remote-tracking branch 'VCI/master' into ReForm-merge-from-VCI

parents d1e3cec2 e9d5c8c7
...@@ -82,8 +82,8 @@ Enter point in the Debug call stack, also used to filter debug output. ...@@ -82,8 +82,8 @@ Enter point in the Debug call stack, also used to filter debug output.
class Enter class Enter
{ {
public: public:
Enter(const char* const _flnm, const char* const _fnct, int& _nmbr, int& _lvl); BASEDLLEXPORT Enter(const char* const _flnm, const char* const _fnct, int& _nmbr, int& _lvl);
~Enter(); BASEDLLEXPORT ~Enter();
//! pass the output on the level or not? //! pass the output on the level or not?
bool pass(const int _lvl) const { return _lvl <= lvl_; } bool pass(const int _lvl) const { return _lvl <= lvl_; }
...@@ -94,7 +94,7 @@ public: ...@@ -94,7 +94,7 @@ public:
//! Get the number of entries in this point //! Get the number of entries in this point
int number() const { return nmbr_; } int number() const { return nmbr_; }
//! Get the stream //! Get the stream
Stream& stream(); BASEDLLEXPORT Stream& stream();
private: private:
int id_; //!< Unique identifier for this entry int id_; //!< Unique identifier for this entry
...@@ -112,8 +112,8 @@ private: ...@@ -112,8 +112,8 @@ private:
Stream strm_; //!< Stream Stream strm_; //!< Stream
}; };
extern void warning(const std::string& _wrng, const ::Base::CodeLink& _lnk); BASEDLLEXPORT extern void warning(const std::string& _wrng, const ::Base::CodeLink& _lnk);
extern void error(const std::string& _err, const ::Base::CodeLink& _lnk); BASEDLLEXPORT extern void error(const std::string& _err, const ::Base::CodeLink& _lnk);
}//namespace Debug }//namespace Debug
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#include <array> #include <array>
#endif #endif
#include <Base/Config/BaseDefines.hh>
namespace boost { namespace boost {
namespace filesystem { namespace filesystem {
class path; class path;
...@@ -41,35 +43,35 @@ class IOutputStream ...@@ -41,35 +43,35 @@ class IOutputStream
{ {
public: public:
virtual ~IOutputStream() {} virtual ~IOutputStream() {}
virtual IOutputStream& print(const char) = 0; BASEDLLEXPORT virtual IOutputStream& print(const char) = 0;
virtual IOutputStream& print(const int) = 0; BASEDLLEXPORT virtual IOutputStream& print(const int) = 0;
virtual IOutputStream& print(const size_t) = 0; BASEDLLEXPORT virtual IOutputStream& print(const size_t) = 0;
virtual IOutputStream& print(const double) = 0; BASEDLLEXPORT virtual IOutputStream& print(const double) = 0;
virtual IOutputStream& print(const char* const) = 0; BASEDLLEXPORT virtual IOutputStream& print(const char* const) = 0;
virtual IOutputStream& print(const Command&) = 0; BASEDLLEXPORT virtual IOutputStream& print(const Command&) = 0;
}; };
IOutputStream& operator<<(IOutputStream& _ds, const int _i); BASEDLLEXPORT IOutputStream& operator<<(IOutputStream& _ds, const int _i);
IOutputStream& operator<<(IOutputStream& _ds, const double _d); BASEDLLEXPORT IOutputStream& operator<<(IOutputStream& _ds, const double _d);
IOutputStream& operator<<(IOutputStream& _ds, const char* const _s); BASEDLLEXPORT IOutputStream& operator<<(IOutputStream& _ds, const char* const _s);
IOutputStream& operator<<(IOutputStream& _ds, const char _c); BASEDLLEXPORT IOutputStream& operator<<(IOutputStream& _ds, const char _c);
IOutputStream& operator<<(IOutputStream& _ds, const size_t _i); BASEDLLEXPORT IOutputStream& operator<<(IOutputStream& _ds, const size_t _i);
IOutputStream& operator<<(IOutputStream& _ds, const unsigned int _i); BASEDLLEXPORT IOutputStream& operator<<(IOutputStream& _ds, const unsigned int _i);
IOutputStream& operator<<(IOutputStream& _ds, const float _f); BASEDLLEXPORT IOutputStream& operator<<(IOutputStream& _ds, const float _f);
IOutputStream& operator<<(IOutputStream& _ds, const std::string& _s); BASEDLLEXPORT IOutputStream& operator<<(IOutputStream& _ds, const std::string& _s);
IOutputStream& operator<<(IOutputStream& _ds, const Command& _co); BASEDLLEXPORT IOutputStream& operator<<(IOutputStream& _ds, const Command& _co);
IOutputStream& operator<<(IOutputStream& _ds, const Command::Type _cmd_type); BASEDLLEXPORT IOutputStream& operator<<(IOutputStream& _ds, const Command::Type _cmd_type);
IOutputStream& operator<<(IOutputStream& _ds, BASEDLLEXPORT IOutputStream& operator<<(IOutputStream& _ds,
const boost::filesystem::path& _path); const boost::filesystem::path& _path);
// IStream operator for std::vector<> // IStream operator for std::vector<>
......
...@@ -10,12 +10,12 @@ namespace Base { ...@@ -10,12 +10,12 @@ namespace Base {
class OStringStream : public IOutputStream class OStringStream : public IOutputStream
{ {
public: public:
virtual IOutputStream& print(const char); BASEDLLEXPORT virtual IOutputStream& print(const char);
virtual IOutputStream& print(const int); BASEDLLEXPORT virtual IOutputStream& print(const int);
virtual IOutputStream& print(const size_t); BASEDLLEXPORT virtual IOutputStream& print(const size_t);
virtual IOutputStream& print(const double); BASEDLLEXPORT virtual IOutputStream& print(const double);
virtual IOutputStream& print(const char* const); BASEDLLEXPORT virtual IOutputStream& print(const char* const);
virtual IOutputStream& print(const Command&); BASEDLLEXPORT virtual IOutputStream& print(const Command&);
std::string str; std::string str;
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment