import quincy beta 17.1.0

[ceph.git] / ceph / src / tools / rbd / action / MergeDiff.cc

diff --git a/ceph/src/tools/rbd/action/MergeDiff.cc b/ceph/src/tools/rbd/action/MergeDiff.cc
index d33d1c11abbfd8483628b1dc67d6668a19e8c89e..c387be9a4c64ae0aa5cd6c97f8c9bf9299dc5b41 100644 (file)
--- a/ceph/src/tools/rbd/action/MergeDiff.cc
+++ b/ceph/src/tools/rbd/action/MergeDiff.cc
@@ -18,6 +18,8 @@
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_rbd
 
+using std::string;
+
 namespace rbd {
 namespace action {
 namespace merge_diff {
@@ -438,7 +440,7 @@ int execute(const po::variables_map &vm,
   r = do_merge_diff(first_diff.c_str(), second_diff.c_str(), path.c_str(),
                     vm[at::NO_PROGRESS].as<bool>());
   if (r < 0) {
-    cerr << "rbd: merge-diff error" << std::endl;
+    std::cerr << "rbd: merge-diff error" << std::endl;
     return -r;
   }