ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 01:10:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

#18708 EDF 20746 - Strange behaviors after loading YACS

Browse Source 
Pb was in clashing class names (chrono.hxx) in SMESH and YACS
This commit is contained in:
eap 2020-07-08 12:46:18 +03:00
parent 1deb1c3b7e
commit 29c693b1c3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/SMDS/chrono.cxx
View File

@ -21,6 +21,7 @@
#include "utilities.h" #include "utilities.h"
using namespace std; using namespace std;
using namespace SMDS;
cntStruct* counters::_ctrs = 0; cntStruct* counters::_ctrs = 0;
int counters::_nbChrono = 0; int counters::_nbChrono = 0;

10
src/SMDS/chrono.hxx
View File

@ -27,6 +27,8 @@
#include <iostream> #include <iostream>
#include <ctime> #include <ctime>
namespace SMDS
{
typedef struct acnt typedef struct acnt
{ {
char* _ctrNames; char* _ctrNames;
@ -57,9 +59,11 @@ protected:
int _ctr; int _ctr;
clock_t _start, _end; clock_t _start, _end;
}; };
}
#ifdef CHRONODEF #ifdef CHRONODEF
#define CHRONO(i) counters::_ctrs[i]._ctrNames = (char *)__FILE__; \ #define CHRONO(i)
using namespace SMDS; \
counters::_ctrs[i]._ctrNames = (char *)__FILE__; \
counters::_ctrs[i]._ctrLines = __LINE__; \ counters::_ctrs[i]._ctrLines = __LINE__; \
salome_chrono aChrono##i(i); salome_chrono aChrono##i(i);
@ -67,7 +71,7 @@ protected:
#else // CHRONODEF #else // CHRONODEF
#define CHRONO(i) #define CHRONO(i) using namespace SMDS;
#define CHRONOSTOP(i) #define CHRONOSTOP(i)
#endif // CHRONODEF #endif // CHRONODEF