[Libreoffice-commits] cppunit.git: include/cppunit NEWS src/cppunit

[Markus Mohrhard]

 NEWS                                      |    2 +
 include/cppunit/config/SelectDllLoader.h  |    7 ----
 src/cppunit/BeOsDynamicLibraryManager.cpp |   49 ------------------------------
 src/cppunit/Makefile.am                   |    1 
 src/cppunit/cppunit.vcxproj               |    1 
 src/cppunit/cppunit_dll.vcxproj           |    1 
 6 files changed, 2 insertions(+), 59 deletions(-)

New commits:
commit de5eab33cb30f15f85ac8f197bd571b7695566a6
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Apr 13 04:08:37 2017 +0200

    remove BeOS special support

diff --git a/NEWS b/NEWS
index b1e0759..f8ef782 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,8 @@
 
   - msvc6 plugin
 
+  - BeOS support
+
   New in CppUnit 1.13.2:
   ---------------------
 
diff --git a/include/cppunit/config/SelectDllLoader.h b/include/cppunit/config/SelectDllLoader.h
index dc1c011..9f8c0d6 100644
--- a/include/cppunit/config/SelectDllLoader.h
+++ b/include/cppunit/config/SelectDllLoader.h
@@ -15,9 +15,6 @@
  * CPPUNIT_HAVE_WIN32_DLL_LOADER
  * If defined, Win32 implementation of DynamicLibraryManager will be used.
  * 
- * CPPUNIT_HAVE_BEOS_DLL_LOADER
- * If defined, BeOs implementation of DynamicLibraryManager will be used.
- * 
  * CPPUNIT_HAVE_UNIX_DLL_LOADER
  * If defined, Unix implementation (dlfcn.h) of DynamicLibraryManager will be used.
  */
@@ -50,10 +47,6 @@
 #undef CPPUNIT_PLUGIN_EXPORT
 #define CPPUNIT_PLUGIN_EXPORT extern "C" __declspec(dllexport)
 
-// Is BeOS platform ?
-#elif defined(__BEOS__)
-#define CPPUNIT_HAVE_BEOS_DLL_LOADER 1
-
 // Is Unix platform and have shl_load() (hp-ux)
 #elif defined(CPPUNIT_HAVE_SHL_LOAD)
 #define CPPUNIT_HAVE_UNIX_SHL_LOADER 1
diff --git a/src/cppunit/BeOsDynamicLibraryManager.cpp b/src/cppunit/BeOsDynamicLibraryManager.cpp
deleted file mode 100644
index b8568be..0000000
--- a/src/cppunit/BeOsDynamicLibraryManager.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <cppunit/Portability.h>
-
-#if defined(CPPUNIT_HAVE_BEOS_DLL_LOADER)
-#include <cppunit/plugin/DynamicLibraryManager.h>
-
-#include <kernel/image.h>
-
-
-CPPUNIT_NS_BEGIN
-
-
-DynamicLibraryManager::LibraryHandle 
-DynamicLibraryManager::doLoadLibrary( const std::string &libraryName )
-{
-  return (LibraryHandle)::load_add_on( libraryName.c_str() );
-}
-
-
-void 
-DynamicLibraryManager::doReleaseLibrary()
-{
-  ::unload_add_on( (image_id)m_libraryHandle );
-}
-
-
-DynamicLibraryManager::Symbol 
-DynamicLibraryManager::doFindSymbol( const std::string &symbol )
-{
-  void *symbolPointer;
-  if ( ::get_image_symbol( (image_id)m_libraryHandle, 
-                           symbol.c_str(), 
-                           B_SYMBOL_TYPE_TEXT, 
-                           &symbolPointer ) == B_OK )
-    return symnolPointer;
-  return NULL;
-}
-
-
-std::string 
-DynamicLibraryManager::getLastErrorDetail() const
-{
-  return "";
-}
-
-
-CPPUNIT_NS_END
-
-
-#endif // defined(CPPUNIT_HAVE_BEOS_DLL_LOADER)
diff --git a/src/cppunit/Makefile.am b/src/cppunit/Makefile.am
index 7134bad..bb67a8a 100644
--- a/src/cppunit/Makefile.am
+++ b/src/cppunit/Makefile.am
@@ -10,7 +10,6 @@ lib_LTLIBRARIES = libcppunit.la
 libcppunit_la_SOURCES = \
   AdditionalMessage.cpp \
   Asserter.cpp \
-  BeOsDynamicLibraryManager.cpp \
   BriefTestProgressListener.cpp \
   CompilerOutputter.cpp \
   DefaultProtector.h \
diff --git a/src/cppunit/cppunit.vcxproj b/src/cppunit/cppunit.vcxproj
index 7b7b270..43c63a0 100644
--- a/src/cppunit/cppunit.vcxproj
+++ b/src/cppunit/cppunit.vcxproj
@@ -299,7 +299,6 @@
     <ClCompile Include="TestCaseDecorator.cpp" />
     <ClCompile Include="TestDecorator.cpp" />
     <ClCompile Include="TestSetUp.cpp" />
-    <ClCompile Include="BeOsDynamicLibraryManager.cpp" />
     <ClCompile Include="DynamicLibraryManager.cpp" />
     <ClCompile Include="DynamicLibraryManagerException.cpp" />
     <ClCompile Include="PlugInManager.cpp" />
diff --git a/src/cppunit/cppunit_dll.vcxproj b/src/cppunit/cppunit_dll.vcxproj
index 71ef783..043e977 100644
--- a/src/cppunit/cppunit_dll.vcxproj
+++ b/src/cppunit/cppunit_dll.vcxproj
@@ -309,7 +309,6 @@ copy "$(TargetDir)$(TargetName).lib" ..\..\lib\$(TargetName).lib</Command>
     <ClCompile Include="TestSuccessListener.cpp" />
     <ClCompile Include="TextTestProgressListener.cpp" />
     <ClCompile Include="TextTestResult.cpp" />
-    <ClCompile Include="BeosDynamicLibraryManager.cpp" />
     <ClCompile Include="DynamicLibraryManager.cpp" />
     <ClCompile Include="DynamicLibraryManagerException.cpp" />
     <ClCompile Include="PlugInManager.cpp" />