Skip to content
Snippets Groups Projects

Remove separate dppp_pythonstep shared lib

Merged Remove separate dppp_pythonstep shared lib
pybind11-jakob into pybind11
2 unresolved threads
Merged Jakob Maljaars requested to merge pybind11-jakob into pybind11
2 unresolved threads

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
DPPP/DPRun.cc
81 82 if (pos != string::npos) {
82 83 libname = libname.substr(0, pos);
83 84 }
84 // Try to load and initialize the dynamic library.
85 casacore::DynLib dl(libname, string("libdppp_"), "register_" + libname,
86 false);
87 if (dl.getHandle()) {
88 // See if registered now.
89 iter = theirStepMap.find(type);
90 if (iter != theirStepMap.end()) {
91 return iter->second;
85
  • Bas van der Tol
    Bas van der Tol @tol ·
    Developer

    I think this change is not correct. AFAIK no exception is thrown when the shared library is not found. And when the library is found and loaded, but does not register a step, then theirStepMap.find(type) will fail but not by throwing an exception, but by returning map::end.

    The change removes the handling of error conditions that do not throw an exception. The compiler warns for this DP3/DPPP/DPRun.cc:79:27: warning: control reaches end of non-void function [-Wreturn-type]

    Edited by Bas van der Tol
  • Jakob Maljaars
    Jakob Maljaars @jmmaljaars ·
    Author Contributor

    I inserted the try... catch because I got a non DP3 related exception error when the dppp_pythonstep lib was not found. I will remove the try... catch.

  • Jakob Maljaars
    Jakob Maljaars @jmmaljaars ·
    Author Contributor

    Should be fixed

  • Please register or sign in to reply
  • Bas van der Tol
    Bas van der Tol @tol started a thread on the diff
    • external/CMakeLists.txt deleted 100644 → 0
    1 find_package(Git QUIET)
    2 if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
    3 # Update submodules as needed
    4 option(GIT_SUBMODULE "Check submodules during configure" ON)
    5 if(GIT_SUBMODULE)
    6 message(STATUS "Submodule update")
    7 message(STATUS "Syncing submodules")
    8 execute_process(COMMAND ${GIT_EXECUTABLE} submodule sync --recursive
  • Jakob Maljaars added 1 commit

    added 1 commit

    Compare with previous version

  • Bas van der Tol approved this merge request

    approved this merge request

  • Bas van der Tol enabled an automatic merge when the pipeline for 7d7a6b12 succeeds

    enabled an automatic merge when the pipeline for 7d7a6b12 succeeds

  • Bas van der Tol merged

    merged

  • Bas van der Tol mentioned in commit 891973ae

    mentioned in commit 891973ae

    • Please register or sign in to reply