diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-12-05 15:49:31 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-01-12 16:53:38 -0500 |
| commit | 1ab880a1a03ff8a59e8490395d2181af180983f3 (patch) | |
| tree | 184524370abcaf6ce5b74d855382c8833a25df78 | |
| parent | 22ecacc18c3b3623f98aa7e7efec659dd3593b7d (diff) | |
| download | phosphor-inventory-manager-1ab880a1a03ff8a59e8490395d2181af180983f3.tar.gz phosphor-inventory-manager-1ab880a1a03ff8a59e8490395d2181af180983f3.zip | |
Fix broken usage of emplace
No need to construct a temporary when using emplace.
Change-Id: I224054855d0098e128973b8bea23ac000e7231f6
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
| -rw-r--r-- | manager.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/manager.cpp b/manager.cpp index d3e2973..4286e54 100644 --- a/manager.cpp +++ b/manager.cpp @@ -82,19 +82,17 @@ Manager::Manager( // after the manager is constructed. _sigargs.emplace_back( std::make_unique<SigArg>( - std::make_tuple( this, dbusEvent, - &group))); + &group)); // Register our callback and the context for // each signal event. _matches.emplace_back( - sdbusplus::server::match::match( _bus, std::get<0>(*dbusEvent), details::_signal, - _sigargs.back().get())); + _sigargs.back().get()); } } @@ -145,18 +143,15 @@ void Manager::notify(std::string path, Object object) throw std::runtime_error( "Unimplemented interface: " + x.first); - ref.emplace( - std::make_pair( - x.first, - (maker->second)(_bus, path.c_str()))); + ref.emplace(x.first, + (maker->second)(_bus, path.c_str())); } // Hang on to a reference to the object (interfaces) // so it stays on the bus, and so we can make calls // to it if needed. _refs.emplace( - std::make_pair( - path, std::move(ref))); + path, std::move(ref)); } catch (const std::exception &e) { std::cerr << e.what() << std::endl; |

