summaryrefslogtreecommitdiff
path: root/src/cppunit
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-04-24 01:17:19 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-04-25 11:08:37 +0200
commit0a0a19e09bfdfd98544bdb987d01b0a3ae67e334 (patch)
tree314c22a26a2ba70a23be616a9d3d613e1ec5087c /src/cppunit
parentcbe43bf5161a7c10461ab2e20b76a3771ece8d70 (diff)
downloadcppunit-0a0a19e09bfdfd98544bdb987d01b0a3ae67e334.tar.gz
try to fix problem with ISO c++ function vs object pointer
http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#195
Diffstat (limited to 'src/cppunit')
-rw-r--r--src/cppunit/PlugInManager.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cppunit/PlugInManager.cpp b/src/cppunit/PlugInManager.cpp
index b595dee..7343094 100644
--- a/src/cppunit/PlugInManager.cpp
+++ b/src/cppunit/PlugInManager.cpp
@@ -1,5 +1,6 @@
#include <cppunit/config/SourcePrefix.h>
#include <cppunit/XmlOutputterHook.h>
+#include <stdint.h>
#if !defined(CPPUNIT_NO_TESTPLUGIN)
#include <cppunit/extensions/TestFactoryRegistry.h>
@@ -31,8 +32,8 @@ PlugInManager::load( const std::string &libraryFileName,
info.m_fileName = libraryFileName;
info.m_manager = new DynamicLibraryManager( libraryFileName );
- TestPlugInSignature plug = (TestPlugInSignature)info.m_manager->findSymbol(
- CPPUNIT_STRINGIZE( CPPUNIT_PLUGIN_EXPORTED_NAME ) );
+ TestPlugInSignature plug = (TestPlugInSignature)((uintptr_t)info.m_manager->findSymbol(
+ CPPUNIT_STRINGIZE( CPPUNIT_PLUGIN_EXPORTED_NAME ) ));
info.m_interface = (*plug)();
m_plugIns.push_back( info );