From 9489286fe470c8156b76b0493445ee2c307779a5 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Wed, 7 Nov 2018 14:12:14 +0100 Subject: [PATCH] B #2544: Fix issues introduced when merging --- src/vm/VirtualMachineDisk.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vm/VirtualMachineDisk.cc b/src/vm/VirtualMachineDisk.cc index cdb0d28e8c..d32223be24 100644 --- a/src/vm/VirtualMachineDisk.cc +++ b/src/vm/VirtualMachineDisk.cc @@ -1621,7 +1621,7 @@ int VirtualMachineDisks::check_tm_mad(const string& tm_mad) { DatastorePool * dspool = Nebula::instance().get_dspool(); - string _tm_mad = tm_mad; + std::string _tm_mad = tm_mad; one_util::toupper(_tm_mad); @@ -1629,7 +1629,7 @@ int VirtualMachineDisks::check_tm_mad(const string& tm_mad) { int ds_img_id; - string tm_mad_disk + std::string tm_mad_disk; (*it)->vector_value("TM_MAD", tm_mad_disk); @@ -1642,7 +1642,7 @@ int VirtualMachineDisks::check_tm_mad(const string& tm_mad) if ( (*it)->vector_value("DATASTORE_ID", ds_img_id) == 0 ) { - string ln_target, clone_target, disk_type; + std::string ln_target, clone_target, disk_type; Datastore * ds_img = dspool->get_ro(ds_img_id);