From 561dadb3ddd6e8240f3a01126f2f21a0d87030d1 Mon Sep 17 00:00:00 2001
From: Sergi Hernandez Juan <shernand@iri.upc.edu>
Date: Mon, 6 Jul 2020 14:07:55 +0200
Subject: [PATCH] Changed the deprecated auto_ptr for the unique_ptr. Changed
the xsd library to generate code with the C++11 standard.
---
src/ptu_d46.cpp | 2 +-
src/xml/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ptu_d46.cpp b/src/ptu_d46.cpp
index c2588d3..6ada445 100755
--- a/src/ptu_d46.cpp
+++ b/src/ptu_d46.cpp
@@ -667,7 +667,7 @@ void CPTUD46::load_config(std::string &filename)
{
// try to open the specified file
try{
- std::auto_ptr<ptud46_config_t> cfg(ptud46_config(filename.c_str(),xml_schema::flags::dont_validate));
+ std::unique_ptr<ptud46_config_t> cfg(ptud46_config(filename.c_str(),xml_schema::flags::dont_validate));
// configure the serial port
text << this->ptu_id << "_serial_port";
this->serial_dev=new CRS232(text.str());
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index af74ebb..3109268 100755
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -36,7 +36,7 @@ IF(XSD_FOUND)
ADD_CUSTOM_TARGET(xsd_files_gen DEPENDS ${XSD_SOURCES_INT})
ADD_CUSTOM_COMMAND(
OUTPUT ${XSD_SOURCES_INT}
- COMMAND xsdcxx cxx-tree --generate-serialization ${XSD_FILES}
+ COMMAND xsdcxx cxx-tree --std c++11 --generate-serialization ${XSD_FILES}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${XSD_PATH_FILES}
COMMENT "Parsing the xml template file ${XSD_FILES}")
--
GitLab