Commit 529bab33 authored by Martin Marinov's avatar Martin Marinov

Integrated changes to unify the CoMISo source code base from the research...

Integrated changes to unify the CoMISo source code base from the research branch. No behavior changes. 

[git-p4: depot-paths = "//ReForm/ReForm/main/Base/": change = 13637]
parent 8eebe069
......@@ -748,7 +748,7 @@ public:
Stream* _deb_stream,
Stream::StreamType _type = (Stream::StreamType)(Stream::APPEND | Stream::RETAIN),
const char* _file_name = nullptr) :
type_(_type), lev_(5), deb_stream_(_deb_stream), num_flush_(0)
type_(_type), lev_(5), num_flush_(0), deb_stream_(_deb_stream)
{
read_debug_config();
set_file_name(_file_name);
......
......@@ -14,6 +14,8 @@
#include <Base/Utils/StopWatch.hh>
#include <Base/Debug/DebOut.hh>
#ifdef DEB_ON
namespace Debug {
class StopWatchSession
......@@ -57,4 +59,16 @@ private:
#define DEB_time_func_def DEB_time_func(2)
#else
#define DEB_time_session(SSSN, LL)
#define DEB_time_session_def(SSSN)
#define DEB_time_func(LL)
#define DEB_time_func_def
#endif // DEB_ON
#endif//BASE_DEBTIME_HH_INCLUDED
......@@ -64,7 +64,7 @@ struct ErrorExtT : public ErrorT, public ThrowInfo
#define THROW_ERROR_MODULE_VAR(MODULE, VAR) { throw MODULE::Error(VAR); }
#define THROW_ERROR_MODULE(MODULE, INDEX) \
THROW_ERROR_MODULE_VAR(MODULE::Error::INDEX)
THROW_ERROR_MODULE_VAR(MODULE, MODULE::Error::INDEX)
#define THROW_ERROR_DEB_MODULE(MODULE, EXPR) THROW_ERROR_MODULE(MODULE, TODO)
......
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