Changeset 125:02bd376df2bb in finroc_plugins_runtime_construction


Ignore:
Timestamp:
27.02.2019 23:55:23 (3 weeks ago)
Author:
Max Reichardt <mreichardt@…>
Branch:
default
Phase:
public
Tags:
tip
Message:

Makes DLOpen function not attempt to load shared libraries with version postfix in development branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • dynamic_loading.cpp

    r121 r125  
    196196void DLOpen(const tSharedLibrary& shared_library) 
    197197{ 
    198   void* handle = dlopen(shared_library.ToString(true).c_str(), RTLD_NOW | RTLD_GLOBAL); 
    199   if (handle) 
    200   { 
    201     tDLCloserInstance::Instance().loaded.push_back(handle); 
    202     core::internal::tPlugins::GetInstance().InitializeNewPlugins(); 
    203  
    204     return; 
    205   } 
    206   FINROC_LOG_PRINTF(WARNING, "Error from dlopen: %s. Will try without soname.", dlerror()); 
    207   handle = dlopen(shared_library.ToString(true, false).c_str(), RTLD_NOW | RTLD_GLOBAL); 
     198  if (FINROC_VERSION_MONTH >= 1 && FINROC_VERSION_MONTH <= 12) 
     199  { 
     200    void* handle = dlopen(shared_library.ToString(true).c_str(), RTLD_NOW | RTLD_GLOBAL); 
     201    if (handle) 
     202    { 
     203      tDLCloserInstance::Instance().loaded.push_back(handle); 
     204      core::internal::tPlugins::GetInstance().InitializeNewPlugins(); 
     205      return; 
     206    } 
     207    FINROC_LOG_PRINTF(WARNING, "Error from dlopen: %s. Will try without soname.", dlerror()); 
     208  } 
     209  void* handle = dlopen(shared_library.ToString(true, false).c_str(), RTLD_NOW | RTLD_GLOBAL); 
    208210  if (handle) 
    209211  { 
Note: See TracChangeset for help on using the changeset viewer.