From cca384ea58ee75dd094611245f449140f078363c Mon Sep 17 00:00:00 2001 From: Kunal Tyagi Date: Sat, 11 Jan 2020 05:45:17 +0900 Subject: [PATCH] Modern for loop --- io/src/ply/ply_parser.cpp | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/io/src/ply/ply_parser.cpp b/io/src/ply/ply_parser.cpp index 9fd695b76b7..505cc0cfa0b 100644 --- a/io/src/ply/ply_parser.cpp +++ b/io/src/ply/ply_parser.cpp @@ -454,11 +454,9 @@ bool pcl::io::ply::ply_parser::parse (const std::string& filename) // ascii if (format == ascii_format) { - for (auto element_iterator = elements.cbegin (); - element_iterator != elements.cend (); - ++element_iterator) + for (const auto element_ptr: elements) { - struct element& element = *(element_iterator->get ()); + auto& element = *(element_ptr.get ()); for (std::size_t element_index = 0; element_index < element.count; ++element_index) { if (element.begin_element_callback) @@ -473,11 +471,10 @@ bool pcl::io::ply::ply_parser::parse (const std::string& filename) std::istringstream stringstream (line); stringstream.unsetf (std::ios_base::skipws); stringstream >> std::ws; - for (auto property_iterator = element.properties.cbegin (); - property_iterator != element.properties.cend (); - ++property_iterator) + + for (const auto property_ptr: element.properties) { - struct property& property = *(property_iterator->get ()); + auto& property = *(property_ptr.get ()); if (!property.parse (*this, format, stringstream)) { error_callback_ (line_number_, "parse error: element property count doesn't match the declaration in the header"); @@ -511,20 +508,16 @@ bool pcl::io::ply::ply_parser::parse (const std::string& filename) istream.open (filename.c_str (), std::ios::in | std::ios::binary); istream.seekg (data_start); - for (auto element_iterator = elements.cbegin (); - element_iterator != elements.cend (); - ++element_iterator) + for (const auto element_ptr: elements) { - struct element& element = *(element_iterator->get ()); + auto& element = *(element_ptr.get ()); for (std::size_t element_index = 0; element_index < element.count; ++element_index) { if (element.begin_element_callback) element.begin_element_callback (); - for (auto property_iterator = element.properties.cbegin (); - property_iterator != element.properties.cend (); - ++property_iterator) + for (const auto property_ptr: element.properties) { - struct property& property = *(property_iterator->get ()); + auto& property = *(property_ptr.get ()); if (!property.parse (*this, format, istream)) { return false;