Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated copyright comment
[modules/kernel.git]
/
src
/
SALOMETraceCollector
/
Test
/
SALOMETraceCollectorTest.cxx
diff --git
a/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
b/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
index 4a448f8baccd50382b4673b9200858f8b80711a2..5b4d204d8594d190d49879a000358b9fd0078a1f 100644
(file)
--- a/
src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
+++ b/
src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
12 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-69,6
+69,7
@@
void *PrintHello(void *threadid);
void
SALOMETraceCollectorTest::testLoadBufferPoolCORBA()
{
void
SALOMETraceCollectorTest::testLoadBufferPoolCORBA()
{
+ LocalTraceBufferPool* bp1 = LocalTraceBufferPool::instance();
std::string s = "with_logger";
CPPUNIT_ASSERT(! setenv("SALOME_trace",s.c_str(),1)); // 1: overwrite
std::string s = "with_logger";
CPPUNIT_ASSERT(! setenv("SALOME_trace",s.c_str(),1)); // 1: overwrite
@@
-92,7
+93,6
@@
SALOMETraceCollectorTest::testLoadBufferPoolCORBA()
}
MESSAGE(" ---- end of PrintHello threads ---- ");
}
MESSAGE(" ---- end of PrintHello threads ---- ");
- LocalTraceBufferPool* bp1 = LocalTraceBufferPool::instance();
CPPUNIT_ASSERT(bp1);
bp1->deleteInstance(bp1);
}
CPPUNIT_ASSERT(bp1);
bp1->deleteInstance(bp1);
}
@@
-106,6
+106,7
@@
SALOMETraceCollectorTest::testLoadBufferPoolCORBA()
void *PrintHello(void *threadid)
{
void *PrintHello(void *threadid)
{
+ SALOME_UNUSED(threadid); // unused in release mode
#if defined(_DEBUG_) || defined(_DEBUG)
long id_thread = (long)threadid;
for (int i=0; i<NUM_MESSAGES;i++)
#if defined(_DEBUG_) || defined(_DEBUG)
long id_thread = (long)threadid;
for (int i=0; i<NUM_MESSAGES;i++)
@@
-113,7
+114,7
@@
void *PrintHello(void *threadid)
<< " - iter " << i);
#endif
pthread_exit(NULL);
<< " - iter " << i);
#endif
pthread_exit(NULL);
- #ifdef WIN32
\r
- return NULL;
\r
-
#endif
+#ifdef WIN32
+ return NULL;
+#endif
}
}