From 2240ef4424a19fb9e244f1211ed68ee81bff1baf Mon Sep 17 00:00:00 2001 From: Francisc Date: Tue, 6 Aug 2013 12:43:43 +0300 Subject: [PATCH] changed namespce from CGAL::Visibility_2 to CGAL --- Visibility_2/include/CGAL/Naive_visibility_2.h | 7 +------ .../CGAL/Preprocessed_rotational_sweep_visibility_2.h | 3 --- Visibility_2/include/CGAL/Simple_polygon_visibility_2.h | 3 --- .../include/CGAL/Triangular_expansion_visibility_2.h | 3 --- Visibility_2/test/Visibility_2/benchmark.cpp | 6 +++--- Visibility_2/test/Visibility_2/test_naive_visibility.cpp | 4 ++-- Visibility_2/test/Visibility_2/test_simple_visibility.cpp | 4 ++-- 7 files changed, 8 insertions(+), 22 deletions(-) diff --git a/Visibility_2/include/CGAL/Naive_visibility_2.h b/Visibility_2/include/CGAL/Naive_visibility_2.h index 9d1d9be4f69..8766ebb4340 100644 --- a/Visibility_2/include/CGAL/Naive_visibility_2.h +++ b/Visibility_2/include/CGAL/Naive_visibility_2.h @@ -34,8 +34,6 @@ namespace CGAL { -namespace Visibility_2 { - //debug template void print(std::vector ps){ @@ -788,10 +786,7 @@ void print_arrangement(const Arrangement_2 &arr) { std::cout << "[" << eit->curve() << "]" << std::endl; } - - -} // namespace Visibility_2 -} // namespace CGAL +} // end namespace CGAL diff --git a/Visibility_2/include/CGAL/Preprocessed_rotational_sweep_visibility_2.h b/Visibility_2/include/CGAL/Preprocessed_rotational_sweep_visibility_2.h index d3c52d566eb..d6f1eaad828 100644 --- a/Visibility_2/include/CGAL/Preprocessed_rotational_sweep_visibility_2.h +++ b/Visibility_2/include/CGAL/Preprocessed_rotational_sweep_visibility_2.h @@ -29,8 +29,6 @@ namespace CGAL { -namespace Visibility_2 { - template class Preprocessed_visibility_2 { @@ -103,7 +101,6 @@ private: }; -} // namespace Visibility_2 } // namespace CGAL #endif diff --git a/Visibility_2/include/CGAL/Simple_polygon_visibility_2.h b/Visibility_2/include/CGAL/Simple_polygon_visibility_2.h index 2b7461d2425..e8ff3d3f2d0 100644 --- a/Visibility_2/include/CGAL/Simple_polygon_visibility_2.h +++ b/Visibility_2/include/CGAL/Simple_polygon_visibility_2.h @@ -29,8 +29,6 @@ namespace CGAL { -namespace Visibility_2 { - template class Simple_polygon_visibility_2 { @@ -786,7 +784,6 @@ private: } }; -} // namespace Visibility_2 } // namespace CGAL #endif diff --git a/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h b/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h index 277ac6563cf..636484b6d75 100644 --- a/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h +++ b/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h @@ -28,8 +28,6 @@ namespace CGAL { -namespace Visibility_2 { - template class Triangular_expansion_visibility_2 { @@ -104,7 +102,6 @@ private: }; -} // namespace Visibility_2 } // namespace CGAL #endif diff --git a/Visibility_2/test/Visibility_2/benchmark.cpp b/Visibility_2/test/Visibility_2/benchmark.cpp index 8588033916a..6c08d9d3787 100644 --- a/Visibility_2/test/Visibility_2/benchmark.cpp +++ b/Visibility_2/test/Visibility_2/benchmark.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +//#include #include #include #include @@ -41,9 +41,9 @@ int main() { typedef Traits_2::Point_2 Point_2; typedef Traits_2::X_monotone_curve_2 Segment_2; typedef CGAL::Arrangement_2 Arrangement_2; - typedef CGAL::Visibility_2::Simple_polygon_visibility_2 + typedef CGAL::Simple_polygon_visibility_2 Simple_polygon_visibility_2; - typedef CGAL::Visibility_2::Naive_visibility_2 + typedef CGAL::Simple_polygon_visibility_2 Naive_visibility_2; // First read arrangement diff --git a/Visibility_2/test/Visibility_2/test_naive_visibility.cpp b/Visibility_2/test/Visibility_2/test_naive_visibility.cpp index 8c76ab38b97..d8504764b6d 100644 --- a/Visibility_2/test/Visibility_2/test_naive_visibility.cpp +++ b/Visibility_2/test/Visibility_2/test_naive_visibility.cpp @@ -41,7 +41,7 @@ int main() { typedef Traits_2::Point_2 Point_2; typedef Traits_2::X_monotone_curve_2 Segment_2; typedef CGAL::Arrangement_2 Arrangement_2; - typedef CGAL::Visibility_2::Simple_polygon_visibility_2 + typedef CGAL::Simple_polygon_visibility_2 Simple_polygon_visibility_2; CGAL::test_model_methods(); @@ -53,7 +53,7 @@ int main() { typedef Traits_2::Point_2 Point_2; typedef Traits_2::X_monotone_curve_2 Segment_2; typedef CGAL::Arrangement_2 Arrangement_2; - typedef CGAL::Visibility_2::Simple_polygon_visibility_2 + typedef CGAL::Simple_polygon_visibility_2 Simple_polygon_visibility_2; CGAL::test_model_methods(); diff --git a/Visibility_2/test/Visibility_2/test_simple_visibility.cpp b/Visibility_2/test/Visibility_2/test_simple_visibility.cpp index fb7c4d2442c..626b8badce0 100644 --- a/Visibility_2/test/Visibility_2/test_simple_visibility.cpp +++ b/Visibility_2/test/Visibility_2/test_simple_visibility.cpp @@ -41,7 +41,7 @@ int main() { typedef Traits_2::Point_2 Point_2; typedef Traits_2::X_monotone_curve_2 Segment_2; typedef CGAL::Arrangement_2 Arrangement_2; - typedef CGAL::Visibility_2::Simple_polygon_visibility_2 + typedef CGAL::Simple_polygon_visibility_2 Simple_polygon_visibility_2; CGAL::test_model_methods(); @@ -53,7 +53,7 @@ int main() { typedef Traits_2::Point_2 Point_2; typedef Traits_2::X_monotone_curve_2 Segment_2; typedef CGAL::Arrangement_2 Arrangement_2; - typedef CGAL::Visibility_2::Simple_polygon_visibility_2 + typedef CGAL::Simple_polygon_visibility_2 Simple_polygon_visibility_2; CGAL::test_model_methods();