Changeset 146:a4bae722af30 in finroc_plugins_structure


Ignore:
Timestamp:
23.02.2021 15:41:23 (7 months ago)
Author:
Max Reichardt <max.reichardt@…>
Branch:
default
Parents:
144:20c098f62fcb (diff), 145:97234384eda3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Tags:
tip
Message:

Merge with 17.03

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main_utilities.cpp

    r142 r146  
    4646 
    4747#include "rrlib/logging/configuration.h" 
     48#include "rrlib/logging/sinks/tNonBlockingSink.h" 
    4849#ifdef _LIB_RRLIB_CRASH_HANDLER_PRESENT_ 
    4950#include "rrlib/crash_handler/crash_handler.h" 
     
    192193    rrlib::getopt::tOption offline(name_to_option_map.at("offline")); 
    193194    bool set_offline = offline->IsActive(); 
     195    rrlib::logging::sinks::tNonBlockingSink::RegisterAtFactory(); 
    194196    rrlib::logging::ConfigureFromFile(rrlib::getopt::EvaluateValue(log_config), set_offline); 
    195197  } 
Note: See TracChangeset for help on using the changeset viewer.