From 16fc13db89234a192629c06cada6795e3af68e24 Mon Sep 17 00:00:00 2001
From: Michael Kuron <mkuron@icp.uni-stuttgart.de>
Date: Mon, 8 Apr 2019 12:38:29 +0200
Subject: [PATCH] Remove boost::tuple from VTKOutput
---
src/vtk/VTKOutput.cpp | 8 ++++----
src/vtk/VTKOutput.h | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/vtk/VTKOutput.cpp b/src/vtk/VTKOutput.cpp
index 3d3cfa159..5f60e2cdf 100644
--- a/src/vtk/VTKOutput.cpp
+++ b/src/vtk/VTKOutput.cpp
@@ -1377,13 +1377,13 @@ void VTKOutput::writeVTUHeaderPiece( std::ostream& ofs, const uint_t numberOfCel
{
Base64Writer base64;
for( auto vertex = vc.begin(); vertex != vc.end(); ++vertex )
- base64 << numeric_cast<float>( ( *vertex ).get<0>() ) << numeric_cast<float>( ( *vertex ).get<1>() )
- << numeric_cast<float>( ( *vertex ).get<2>() );
+ base64 << numeric_cast<float>( std::get<0>( *vertex ) ) << numeric_cast<float>( std::get<1>( *vertex ) )
+ << numeric_cast<float>( std::get<2>( *vertex ) );
ofs << " "; base64.toStream( ofs );
}
else for( auto vertex = vc.begin(); vertex != vc.end(); ++vertex )
- ofs << " " << numeric_cast<float>( ( *vertex ).get<0>() ) << " " << numeric_cast<float>( ( *vertex ).get<1>() )
- << " " << numeric_cast<float>( ( *vertex ).get<2>() ) << "\n";
+ ofs << " " << numeric_cast<float>( std::get<0>( *vertex ) ) << " " << numeric_cast<float>( std::get<1>( *vertex ) )
+ << " " << numeric_cast<float>( std::get<2>( *vertex ) ) << "\n";
ofs << " </DataArray>\n"
<< " </Points>\n"
diff --git a/src/vtk/VTKOutput.h b/src/vtk/VTKOutput.h
index 8d635ab44..b563fb284 100644
--- a/src/vtk/VTKOutput.h
+++ b/src/vtk/VTKOutput.h
@@ -35,7 +35,7 @@
#include "core/Filesystem.h"
#include <functional>
-#include <boost/tuple/tuple.hpp>
+#include <tuple>
#include <fstream>
#include <string>
@@ -55,16 +55,16 @@ private:
typedef UID< VTKGEN > VTKUID;
// types used during vertex-index mapping procedure when writing (P)VTU files
- typedef boost::tuple< cell_idx_t, cell_idx_t, cell_idx_t > Vertex;
- typedef boost::tuple< real_t, real_t, real_t > VertexCoord;
+ typedef std::tuple< cell_idx_t, cell_idx_t, cell_idx_t > Vertex;
+ typedef std::tuple< real_t, real_t, real_t > VertexCoord;
typedef uint32_t Index;
struct VertexCompare {
bool operator()( const Vertex& lhs, const Vertex& rhs ) const
{
- if( lhs.get<0>() < rhs.get<0>() ||
- ( lhs.get<0>() == rhs.get<0>() && lhs.get<1>() < rhs.get<1>() ) ||
- ( lhs.get<0>() == rhs.get<0>() && lhs.get<1>() == rhs.get<1>() && lhs.get<2>() < rhs.get<2>() ) )
+ if( std::get<0>(lhs) < std::get<0>(rhs) ||
+ ( std::get<0>(lhs) == std::get<0>(rhs) && std::get<1>(lhs) < std::get<1>(rhs) ) ||
+ ( std::get<0>(lhs) == std::get<0>(rhs) && std::get<1>(lhs) == std::get<1>(rhs) && std::get<2>(lhs) < std::get<2>(rhs) ) )
return true;
return false;
}
--
GitLab