diff options
| author | tatiana-yan <tatiana.kondakova@gmail.com> | 2019-09-19 12:07:49 +0300 |
|---|---|---|
| committer | mpimenov <mpimenov@users.noreply.github.com> | 2019-09-19 13:36:24 +0300 |
| commit | e04fc71e8545adf96bb31b8fcc3869ab72049c03 (patch) | |
| tree | 7b1ec7c7fc41f9c0ecc3589cef753e49d82e3bb4 /openlr | |
| parent | 2dc866ccb954bf03647e95f7a1ab30ac03744c29 (diff) | |
Got rid of the old style std/ includes for several files.
Diffstat (limited to 'openlr')
| -rw-r--r-- | openlr/openlr_model_xml.cpp | 6 | ||||
| -rw-r--r-- | openlr/openlr_model_xml.hpp | 4 | ||||
| -rw-r--r-- | openlr/openlr_stat/openlr_stat.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/openlr/openlr_model_xml.cpp b/openlr/openlr_model_xml.cpp index ce6b3217d3..07d87529fc 100644 --- a/openlr/openlr_model_xml.cpp +++ b/openlr/openlr_model_xml.cpp @@ -5,13 +5,15 @@ #include "base/logging.hpp" -#include "std/cstring.hpp" -#include "std/type_traits.hpp" +#include <cstring> +#include <type_traits> #include "boost/optional.hpp" #include "3party/pugixml/src/pugixml.hpp" +using namespace std; + namespace // Primitive utilities to handle simple OpenLR-like XML data. { template <typename Value> diff --git a/openlr/openlr_model_xml.hpp b/openlr/openlr_model_xml.hpp index 660cd3fdd1..61229a4feb 100644 --- a/openlr/openlr_model_xml.hpp +++ b/openlr/openlr_model_xml.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/vector.hpp" +#include <vector> namespace pugi { @@ -14,5 +14,5 @@ struct LinearSegment; bool SegmentFromXML(pugi::xml_node const & segmentNode, LinearSegment & segment); -bool ParseOpenlr(pugi::xml_document const & document, vector<LinearSegment> & segments); +bool ParseOpenlr(pugi::xml_document const & document, std::vector<LinearSegment> & segments); } // namespace openlr diff --git a/openlr/openlr_stat/openlr_stat.cpp b/openlr/openlr_stat/openlr_stat.cpp index 069e55f467..986d3dd4a5 100644 --- a/openlr/openlr_stat/openlr_stat.cpp +++ b/openlr/openlr_stat/openlr_stat.cpp @@ -18,8 +18,6 @@ #include "base/file_name_utils.hpp" #include "base/stl_helpers.hpp" -#include "std/unique_ptr.hpp" - #include <algorithm> #include <cstdint> #include <cstdio> |