Merge branch 'omu/launcher_evol'

[modules/kernel.git] / src / NamingService / Test / NamingServiceTest.hxx

diff --git a/src/NamingService/Test/NamingServiceTest.hxx b/src/NamingService/Test/NamingServiceTest.hxx
index 69ea3df88d6b5a8f23ce9b80a810555c37cade9b..e1fc23ffde6b323a1b8c2d8a69591d9ca34112d3 100644 (file)
--- a/src/NamingService/Test/NamingServiceTest.hxx
+++ b/src/NamingService/Test/NamingServiceTest.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // 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
-// 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
@@ -25,11 +25,22 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 #include "SALOME_NamingService.hxx"
+#include <string>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(nstest)
 
-class NSTEST_echo_i : public virtual POA_NSTEST::echo,
+#ifdef WIN32
+# if defined NAMINGSERVICETEST_EXPORTS || defined NamingServiceTest_EXPORTS
+#  define NAMINGSERVICETEST_EXPORT __declspec( dllexport )
+# else
+#  define NAMINGSERVICETEST_EXPORT __declspec( dllimport )
+# endif
+#else
+# define NAMINGSERVICETEST_EXPORT
+#endif
+
+class NAMINGSERVICETEST_EXPORT NSTEST_echo_i : public virtual POA_NSTEST::echo,
                       public virtual PortableServer::ServantBase
 {
 public:
@@ -52,7 +63,7 @@ private:
   int _num;
 };
 
-class NamingServiceTest : public CppUnit::TestFixture
+class NAMINGSERVICETEST_EXPORT NamingServiceTest : public CppUnit::TestFixture
 {
   CPPUNIT_TEST_SUITE( NamingServiceTest );
   CPPUNIT_TEST( testConstructorDefault );
@@ -139,6 +150,9 @@ public:
   void testDestroyFullDirectory();
   void testGetIorAddr();
 
+ private:
+  std::string _getTraceFileName();
+
 protected:
   void _destroyDirectoryRecurs(std::string path);