]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Update PGPeeringEvent.h to work without using namespace
authorAdam C. Emerson <aemerson@redhat.com>
Fri, 29 Mar 2019 00:35:02 +0000 (20:35 -0400)
committerAdam C. Emerson <aemerson@redhat.com>
Fri, 29 Mar 2019 14:30:34 +0000 (10:30 -0400)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/osd/PGPeeringEvent.h

index 02b8360a46b2579c45857804f429983b18768736..21cc0b1a4647e320914d6f67865213d5c25b097d 100644 (file)
@@ -26,7 +26,7 @@ struct PGCreateInfo {
 class PGPeeringEvent {
   epoch_t epoch_sent;
   epoch_t epoch_requested;
-  string desc;
+  std::string desc;
 public:
   boost::intrusive_ptr< const boost::statechart::event_base > evt;
   bool requires_pg;
@@ -44,7 +44,7 @@ public:
       evt(evt_.intrusive_from_this()),
       requires_pg(req),
       create_info(ci) {
-    stringstream out;
+    std::stringstream out;
     out << "epoch_sent: " << epoch_sent
        << " epoch_requested: " << epoch_requested << " ";
     evt_.print(&out);
@@ -62,7 +62,7 @@ public:
   const boost::statechart::event_base &get_event() {
     return *evt;
   }
-  const string& get_desc() {
+  const std::string& get_desc() {
     return desc;
   }
 };
@@ -100,7 +100,7 @@ struct MNotifyRec : boost::statechart::event< MNotifyRec > {
     : pgid(p), from(from), notify(notify), features(f), past_intervals(pi) {}
   void print(std::ostream *out) const {
     *out << "MNotifyRec " << pgid << " from " << from << " notify: " << notify
-        << " features: 0x" << hex << features << dec
+        << " features: 0x" << std::hex << features << std::dec
         << " " << past_intervals;
   }
 };