Commit 3b07dfa7 authored by Martin Marinov's avatar Martin Marinov
Browse files

Merged research into ReForm.

[git-p4: depot-paths = "//ReForm/ReForm/main/CoMISo/": change = 13222]
parent 47c429fa
......@@ -155,7 +155,7 @@ private:
std::vector<Int> rowind_;
bool show_timings_;
Base:StopWatch sw_;
Base::StopWatch sw_;
};
......
......@@ -12,10 +12,11 @@
#define COMISO_ERROR_HH_INCLUDED
#include <Base/Utils/BaseError.hh>
#include <CoMISo/Config/CoMISoDefines.hh>
namespace COMISO {
class Error : public Base::Error
class COMISODLLEXPORT Error : public Base::Error
{
public:
enum Index
......
......@@ -22,8 +22,8 @@
* *
\*===========================================================================*/
#ifndef VSTOOLS_HH
#define VSTOOLS_HH
#ifndef COMISO_VSTOOLS_HH
#define COMISO_VSTOOLS_HH
#include <math.h>
#include <float.h>
......@@ -72,6 +72,6 @@ inline bool same(const double _x, const double _y, const double _tol)
template <typename T> inline T sqr(const T& _a) { return _a * _a; }
//=============================================================================
#endif // VSTOOLS_HH defined
#endif // COMISO_VSTOOLS_HH defined
//=============================================================================
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