Commit 4d80f5e8 authored by Martin Marinov's avatar Martin Marinov

Merge branch 'VCI-master' into merge-from-VCI

Conflicts:
	Debug/DebError.hh
	Debug/DebFileOut.cc
	Debug/DebFileOut.hh
	Debug/DebOut.hh
	Debug/DebStream.cc
	Debug/DebTime.hh
	Utils/BaseError.hh
	Utils/BaseErrorInc.hh
	Utils/StopWatch.cc
	Utils/StopWatch.hh
	Utils/ThrowError.hh
parents 61d61d5f 7de4bcb9
#ifndef BASEDLLEXPORT
#if defined(WIN32) || defined(_WIN32)
#ifdef BASEDLL
#ifdef USEBASE
#define BASEDLLEXPORT __declspec(dllimport)
#define BASEDLLEXPORTONLY
#else
#define BASEDLLEXPORT __declspec(dllexport)
#define BASEDLLEXPORTONLY __declspec(dllexport)
#endif
#else
#define BASEDLLEXPORT
#define BASEDLLEXPORTONLY
#endif
#else
#define BASEDLLEXPORT
#define BASEDLLEXPORTONLY
#endif
#endif
#undef min
#undef max
......@@ -15,7 +15,7 @@ std::string make_filename(const char* _prfx, const char* _flnm,
std::stringstream sstr_flnm;
sstr_flnm << std::setfill('0') << std::setw(4) << cnt++;
sstr_flnm << SEP << _prfx << SEP << _flnm;
if (_sfx != nullptr)
if (_sfx != NULL)
sstr_flnm << SEP << _sfx;
sstr_flnm << '.' << _ext;
......
......@@ -13,6 +13,8 @@
#ifdef DEB_ON
#include <string>
#include "../Config/BaseDefines.hh"
namespace Debug {
......@@ -20,9 +22,11 @@ namespace Debug {
// prefix_filname_[suffix_]#count#.ext
// count is a number that increase any time the function is called,
// it is expressed with 4 decimal digits filled with zeros.
BASEDLLEXPORT
std::string make_filename(const char* _prfx, const char* _flnm,
const char* _ext, const char* _sfx = nullptr);
const char* _ext, const char* _sfx = NULL);
BASEDLLEXPORT
std::string set_filename_extension(const char* _flnm, const char* _ext);
} // Debug
......
......@@ -21,7 +21,7 @@ namespace Debug {
class StopWatchSession
{
public:
StopWatchSession(Enter& _deb, const char* _sssn_name = nullptr,
StopWatchSession(Enter& _deb, const char* _sssn_name = NULL,
const int _deb_lvl = 2)
: deb(_deb), sssn_name_(_sssn_name), deb_lvl_(_deb_lvl)
{
......
......@@ -12,10 +12,11 @@
#define BASE_ERROR_HH_INCLUDED
#include <Base/Utils/ThrowError.hh>
#include "../Config/BaseDefines.hh"
namespace Base {
class Error
class BASEDLLEXPORT Error
{
public:
enum Index
......@@ -30,7 +31,7 @@ public:
Error(const Index _idx) : idx_((int)_idx) {}
// ! Get the outcome error index
int index() const { return idx_; }
int index() const { return (int)idx_; }
//! Return the error message
virtual const char* message() const;
......
......@@ -11,7 +11,7 @@
#include <Base/Security/Mandatory.hh>
#include "StopWatch.hh"
#ifdef WIN32
#ifdef _MSC_VER
// Windows implementation
//////////////////////////////////////////////////////////////////////////
......
......@@ -48,6 +48,8 @@
#ifndef BASE_STOPWATCH_HH_INCLUDED
#define BASE_STOPWATCH_HH_INCLUDED
#include "../Config/BaseDefines.hh"
namespace Base {
//== CLASS DEFINITION =========================================================
......@@ -58,7 +60,7 @@ namespace Base {
for the current platform.
**/
class StopWatch
class BASEDLLEXPORT StopWatch
{
public:
......
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