From 694fc35b89d6a69fe67a44ac0d0889e77d624933 Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Fri, 19 Feb 2016 09:21:18 +0100 Subject: [PATCH] Update namespace RS_2 to OTR_2 in include files --- .../include/CGAL/OTR_2/Cost.h | 8 ++++---- .../CGAL/OTR_2/Reconstruction_edge_2.h | 2 +- .../CGAL/OTR_2/Reconstruction_face_base_2.h | 10 +++++----- .../OTR_2/Reconstruction_triangulation_2.h | 20 +++++++++---------- .../CGAL/OTR_2/Reconstruction_vertex_base_2.h | 6 +++--- .../include/CGAL/OTR_2/Sample.h | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Cost.h b/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Cost.h index 32dbbe6f29d..b04eaf12299 100644 --- a/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Cost.h +++ b/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Cost.h @@ -17,13 +17,13 @@ // // Author(s) : Fernando de Goes, Pierre Alliez, Ivo Vigan, Clément Jamin -#ifndef CGAL_RS2_COST_H_ -#define CGAL_RS2_COST_H_ +#ifndef CGAL_OTR2_COST_H_ +#define CGAL_OTR2_COST_H_ #include namespace CGAL { -namespace RS_2 { +namespace OTR_2 { template class Cost @@ -107,4 +107,4 @@ public: } } // namespaces -#endif // CGAL_RS2_COST_H_ +#endif // CGAL_OTR2_COST_H_ diff --git a/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_edge_2.h b/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_edge_2.h index e6996fb7c13..9569d5e0a22 100644 --- a/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_edge_2.h +++ b/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_edge_2.h @@ -21,7 +21,7 @@ #define CGAL_RECONSTRUCTION_EDGE_2_H_ namespace CGAL { -namespace RS_2 { +namespace OTR_2 { template class Reconstruction_edge_2 { diff --git a/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_face_base_2.h b/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_face_base_2.h index 73bce4909fa..0714646ccb2 100644 --- a/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_face_base_2.h +++ b/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_face_base_2.h @@ -20,8 +20,8 @@ #ifndef CGAL_RECONSTRUCTION_FACE_BASE_2_H_ #define CGAL_RECONSTRUCTION_FACE_BASE_2_H_ -#include -#include +#include +#include #include #include @@ -29,7 +29,7 @@ /// \cond SKIP_IN_MANUAL namespace CGAL { -namespace RS_2 { +namespace OTR_2 { /// The Reconstruction_face_base_2 class is the default /// vertex class of the Reconstruction_face_base_2 class. @@ -54,8 +54,8 @@ public: }; typedef typename Traits_::FT FT; - typedef RS_2::Cost Cost_; - typedef RS_2::Sample Sample_; + typedef OTR_2::Cost Cost_; + typedef OTR_2::Sample Sample_; typedef std::vector Sample_vector; private: diff --git a/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_triangulation_2.h b/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_triangulation_2.h index 393322a8393..5242f1bfa23 100644 --- a/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_triangulation_2.h +++ b/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_triangulation_2.h @@ -21,11 +21,11 @@ #define CGAL_RECONSTRUCTION_TRIANGULATION_2_H // local -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // CGAL #include @@ -51,7 +51,7 @@ #define EPS 1e-15 namespace CGAL { -namespace RS_2 { +namespace OTR_2 { /// \internal /// The Reconstruction_triangulation_2 class @@ -112,14 +112,14 @@ public: typedef std::vector Edge_vector; - typedef RS_2::Cost Cost_; - typedef RS_2::Sample Sample_; + typedef OTR_2::Cost Cost_; + typedef OTR_2::Sample Sample_; typedef std::vector Sample_vector; typedef typename Sample_vector::const_iterator Sample_vector_const_iterator; - typedef RS_2::Sample_with_priority PSample; + typedef OTR_2::Sample_with_priority PSample; typedef std::priority_queue, - RS_2::greater_priority > SQueue; + OTR_2::greater_priority > SQueue; typedef Reconstruction_edge_2 Rec_edge_2; diff --git a/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_vertex_base_2.h b/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_vertex_base_2.h index 4935f8fad9c..91cf9f9658b 100644 --- a/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_vertex_base_2.h +++ b/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_vertex_base_2.h @@ -21,10 +21,10 @@ #define CGAL_RECONSTRUCTION_VERTEX_BASE_2_H_ #include -#include +#include namespace CGAL { -namespace RS_2 { +namespace OTR_2 { /// The Reconstruction_vertex_base_2 class is the default /// vertex class of the Reconstruction_triangulation_2 class. @@ -42,7 +42,7 @@ class Reconstruction_vertex_base_2 : public Vb public: typedef Vb Base; typedef typename Traits_::FT FT; - typedef RS_2::Sample Sample_; + typedef OTR_2::Sample Sample_; typedef typename Traits_::Point_2 Point; typedef typename Base::Face_handle Face_handle; diff --git a/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Sample.h b/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Sample.h index c9f5e00c07d..094daae3310 100644 --- a/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Sample.h +++ b/Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Sample.h @@ -17,14 +17,14 @@ // // Author(s) : Fernando de Goes, Pierre Alliez, Ivo Vigan, Clément Jamin -#ifndef CGAL_RS2_SAMPLE_H -#define CGAL_RS2_SAMPLE_H +#ifndef CGAL_OTR2_SAMPLE_H +#define CGAL_OTR2_SAMPLE_H /// \cond SKIP_IN_MANUAL namespace CGAL { -namespace RS_2 { +namespace OTR_2 { template class Sample @@ -141,4 +141,4 @@ struct greater_priority } } //end namespaces -#endif // CGAL_RS2_SAMPLE_H +#endif // CGAL_OTR2_SAMPLE_H