Commit c0d80ec2 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[MERGE 79b5e56de14e] - merged in changeset 79b5e56de14e from ledig branch to default.

parent 94e19258
......@@ -74,11 +74,12 @@ void WModuleLoader::load( WSharedAssociativeContainer< std::set< boost::shared_p
{
try
{
WSharedLib l( i->path() );
// load lib
boost::shared_ptr< WSharedLib > l = boost::shared_ptr< WSharedLib >( new WSharedLib( i->path() ) );
// get instantiation function
W_LOADABLE_MODULE_SIGNATURE f;
l.fetchFunction< W_LOADABLE_MODULE_SIGNATURE >( W_LOADABLE_MODULE_SYMBOL, f );
l->fetchFunction< W_LOADABLE_MODULE_SIGNATURE >( W_LOADABLE_MODULE_SYMBOL, f );
// get the first prototype
WModuleList m;
......
......@@ -30,6 +30,7 @@
#include <vector>
#include <boost/filesystem.hpp>
#include <boost/shared_ptr.hpp>
#include "../common/WLogger.h"
#include "../common/WSharedAssociativeContainer.h"
......@@ -74,7 +75,7 @@ private:
/**
* All the loaded shared libraries. Get freed on destruction. So do NOT free this instance while the libs are used.
*/
std::vector< WSharedLib > m_libs;
std::vector< boost::shared_ptr< WSharedLib > > m_libs;
/**
* Load the module prototypes from the shared libraries from the specified directory. It traverses the subdirectories and searches there.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment