]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25879 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 14 Jan 2019 23:40:30 +0000 (15:40 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 14 Jan 2019 23:40:30 +0000 (15:40 -0800)
* refs/pull/25879/head:
client: define template to declare ref
client: use message smart ptr instead of raw ptr
client: make map lookup optimizations
client: do not clear message payload
client: clean up variable name
*: use std::string_view instead of char ptr

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/messages/MLock.h

index be1265822689b80fcc593d860e63235882a1b652,eec664d800b2f408507d146a3c34e08e5be7c572..decaabae7be7734a665fa460f05026770bcd10ca
@@@ -65,10 -65,10 +65,10 @@@ protected
    ~MLock() override {}
    
  public:
-   const char *get_type_name() const override { return "ILock"; }
+   std::string_view get_type_name() const override { return "ILock"; }
    void print(ostream& out) const override {
 -    out << "lock(a=" << get_lock_action_name(action)
 -      << " " << get_lock_type_name(lock_type)
 +    out << "lock(a=" << SimpleLock::get_lock_action_name(action)
 +      << " " << SimpleLock::get_lock_type_name(lock_type)
        << " " << object_info
        << ")";
    }