Module: check_mk
Branch: master
Commit: c355e12bd77de9895a6f5b85fcc8190effa98c95
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c355e12bd77de9…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Jun 6 12:14:45 2016 +0200
Fetched Livestatus from downstream.
---
livestatus/src/DynamicColumn.cc | 8 +++++---
livestatus/src/DynamicColumn.h | 2 +-
livestatus/src/DynamicEventConsoleReplicationColumn.cc | 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/livestatus/src/DynamicColumn.cc b/livestatus/src/DynamicColumn.cc
index c17c86d..351304c 100644
--- a/livestatus/src/DynamicColumn.cc
+++ b/livestatus/src/DynamicColumn.cc
@@ -23,13 +23,15 @@
// Boston, MA 02110-1301 USA.
#include "DynamicColumn.h"
+#include <utility>
+using std::move;
using std::string;
-DynamicColumn::DynamicColumn(const string& name, const string& description,
+DynamicColumn::DynamicColumn(string name, string description,
int indirect_offset, int extra_offset)
- : _name(name)
- , _description(description)
+ : _name(move(name))
+ , _description(move(description))
, _indirect_offset(indirect_offset)
, _extra_offset(extra_offset) {}
diff --git a/livestatus/src/DynamicColumn.h b/livestatus/src/DynamicColumn.h
index aa5ef65..f37fcc5 100644
--- a/livestatus/src/DynamicColumn.h
+++ b/livestatus/src/DynamicColumn.h
@@ -31,7 +31,7 @@ class Column;
class DynamicColumn {
public:
- DynamicColumn(const std::string &name, const std::string &description,
+ DynamicColumn(std::string name, std::string description,
int indirect_offset, int extra_offset);
virtual ~DynamicColumn();
std::string name() const;
diff --git a/livestatus/src/DynamicEventConsoleReplicationColumn.cc
b/livestatus/src/DynamicEventConsoleReplicationColumn.cc
index 0f510b2..93034be 100644
--- a/livestatus/src/DynamicEventConsoleReplicationColumn.cc
+++ b/livestatus/src/DynamicEventConsoleReplicationColumn.cc
@@ -40,6 +40,7 @@ extern char g_mkeventd_socket_path[4096];
#endif
using std::make_unique;
+using std::move;
using std::string;
using std::unique_ptr;
using std::vector;
@@ -64,9 +65,9 @@ public:
ReplicationColumn(string name, string description, int indirect_offset,
int extra_offset, string blob)
: BlobColumn(name, description, indirect_offset, extra_offset)
- , _blob(blob) {}
+ , _blob(move(blob)) {}
- unique_ptr<vector<char>> getBlob(void *) override {
+ unique_ptr<vector<char>> getBlob(void * /* unused */) override {
return make_unique<vector<char>>(_blob.begin(), _blob.end());
};