Changeset 135:99d7552031ff in finroc_plugins_blackboard


Ignore:
Timestamp:
18.02.2019 08:01:17 (3 years ago)
Author:
Max Reichardt <mreichardt@…>
Branch:
17.03
Children:
136:fdb0c98131b4, 137:f7b272f25ea9
Parents:
133:0c47d8037f8f (diff), 134:e757809af14e (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
Message:

Merge with 14.08

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tests/blackboard_stress_test.cpp

    r134 r135  
    8787  mBlackboardTestServer(tFrameworkElement* parent, const std::string& name = "Server") : 
    8888    tModule(parent, name), 
    89     blackboard("Test Blackboard", this, tBlackboardBufferMode::MULTI_BUFFERED, 20, false, finroc::blackboard::tReadPorts::EXTERNAL), 
    90     blackboard_no_copy("Test Blackboard No Copy", this, tBlackboardBufferMode::SINGLE_BUFFERED, 20, false, finroc::blackboard::tReadPorts::NONE) 
     89    blackboard("Test Blackboard", this, tBlackboardBufferMode::MULTI_BUFFERED, 20, false), 
     90    blackboard_no_copy("Test Blackboard No Copy", this, tBlackboardBufferMode::SINGLE_BUFFERED, 20, false, nullptr) 
    9191  { 
    9292  } 
     
    117117  mBlackboardTestClient(tFrameworkElement* parent, const std::string& name, bool read_ports) : 
    118118    finroc::structure::tThreadContainer<finroc::structure::tModule>(parent, name), 
    119     blackboard_client("Blackboard Client", this, false, read_ports ? finroc::blackboard::tReadPorts::EXTERNAL : finroc::blackboard::tReadPorts::NONE), 
     119    blackboard_client("Blackboard Client", this, false, read_ports ? tBlackboardClient<tBlackboardDataType>::UseDefaultComponentInterface() : nullptr), 
    120120    reader(false), 
    121121    outside_lock_delay_ms(0), 
Note: See TracChangeset for help on using the changeset viewer.