From 0a0a19e09bfdfd98544bdb987d01b0a3ae67e334 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Tue, 24 Apr 2012 01:17:19 +0200
Subject: try to fix problem with ISO c++ function vs object pointer

http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#195
---
 src/cppunit/PlugInManager.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/cppunit')

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 );
-- 
cgit v1.2.1