Skip to content
Snippets Groups Projects
Commit 353baf57 authored by Lars Bilke's avatar Lars Bilke
Browse files

Merge branch 'ReplaceBoostAny' into 'master'

Replace boost::any with std::any.

See merge request ogs/ogs!3517
parents c9c4b019 8c62eaa9
No related branches found
No related tags found
No related merge requests found
......@@ -295,15 +295,15 @@ std::size_t CsvInterface::getVectorSize(std::size_t idx) const
{
if (_data[idx].type() == typeid(std::vector<std::string>))
{
return boost::any_cast<std::vector<std::string>>(_data[idx]).size();
return std::any_cast<std::vector<std::string>>(_data[idx]).size();
}
if (_data[idx].type() == typeid(std::vector<double>))
{
return boost::any_cast<std::vector<double>>(_data[idx]).size();
return std::any_cast<std::vector<double>>(_data[idx]).size();
}
if (_data[idx].type() == typeid(std::vector<int>))
{
return boost::any_cast<std::vector<int>>(_data[idx]).size();
return std::any_cast<std::vector<int>>(_data[idx]).size();
}
return 0;
}
......@@ -312,17 +312,16 @@ void CsvInterface::writeValue(std::size_t vec_idx, std::size_t in_vec_idx)
{
if (_data[vec_idx].type() == typeid(std::vector<std::string>))
{
_out << boost::any_cast<std::vector<std::string>>(
_out << std::any_cast<std::vector<std::string>>(
_data[vec_idx])[in_vec_idx];
}
else if (_data[vec_idx].type() == typeid(std::vector<double>))
{
_out << boost::any_cast<std::vector<double>>(
_data[vec_idx])[in_vec_idx];
_out << std::any_cast<std::vector<double>>(_data[vec_idx])[in_vec_idx];
}
else if (_data[vec_idx].type() == typeid(std::vector<int>))
{
_out << boost::any_cast<std::vector<int>>(_data[vec_idx])[in_vec_idx];
_out << std::any_cast<std::vector<int>>(_data[vec_idx])[in_vec_idx];
}
}
......
......@@ -13,9 +13,7 @@
#pragma once
#include <boost/any.hpp>
#include "BaseLib/Logging.h"
#include <any>
#include <array>
#include <fstream>
#include <iterator>
......@@ -25,9 +23,9 @@
#include <typeinfo>
#include <vector>
#include "BaseLib/StringTools.h"
#include "BaseLib/IO/Writer.h"
#include "BaseLib/Logging.h"
#include "BaseLib/StringTools.h"
namespace GeoLib
{
......@@ -253,7 +251,7 @@ private:
bool _writeCsvHeader{true};
std::vector<std::string> _vec_names;
std::vector<boost::any> _data;
std::vector<std::any> _data;
};
} // namespace FileIO
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment