From f575392469acad32c26e0460af3e02b1cb68724c Mon Sep 17 00:00:00 2001 From: Andreas Meyer Date: Tue, 3 Apr 2007 12:51:51 +0000 Subject: [PATCH] fixed test-program license statement, by removing it: now it only says, that it's part of the internal release and should not be distributed (similar to other packages) --- .../test/STL_Extension/test_Cache.cpp | 38 ++++++------------ .../test_Flattening_iterator.cpp | 28 +++---------- .../STL_Extension/test_Handle_with_policy.cpp | 40 ++++++------------- .../test_lexcompare_outputrange.cpp | 28 ++++--------- 4 files changed, 38 insertions(+), 96 deletions(-) diff --git a/STL_Extension/test/STL_Extension/test_Cache.cpp b/STL_Extension/test/STL_Extension/test_Cache.cpp index c68eeb01ce9..ca3f7827787 100644 --- a/STL_Extension/test/STL_Extension/test_Cache.cpp +++ b/STL_Extension/test/STL_Extension/test_Cache.cpp @@ -1,26 +1,12 @@ // ============================================================================ // -// Copyright (c) 2001-2006 Max-Planck-Institut Saarbruecken (Germany). -// All rights reserved. -// -// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/); -// you may redistribute it under the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with EXACUS. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// This software and related documentation is part of an INTERNAL release +// of the Computational Geometry Algorithms Library (CGAL). It is not +// intended for general use. // // ---------------------------------------------------------------------------- -// -// Library : Support -// File : test/Cache.C -// SoX_release : $Name: $ -// Revision : $Revision$ -// Revision_date : $Date$ -// +// $URL$ +// $Id$ // Author(s) : Michael Hemmer // // ============================================================================ @@ -51,8 +37,8 @@ struct Int_t : public CGAL::Handle_with_policy< Int_rep, Unify > { // test initialize_with this->initialize_with( i, j + k); } - - // This is needed to prevent VC7.1 and VC8 to call + + // This is needed to prevent VC7.1 and VC8 to call // the explicit templated constructor in Base instead of its copy-ctor. Int_t( Int_t const& rhs ) : Base( static_cast(rhs) ) {} @@ -73,16 +59,16 @@ void test_typedefs(){ typedef CGAL::Cache Cache; BOOST_STATIC_ASSERT(( ::boost::is_same< Cache::Input, int >::value )); BOOST_STATIC_ASSERT(( ::boost::is_same< Cache::Output,double>::value )); - typedef CGAL::Creator_1 Creator_double; + typedef CGAL::Creator_1 Creator_double; BOOST_STATIC_ASSERT(( ::boost::is_same::value )); - typedef CGAL::Creator_1 Creator_int; + typedef CGAL::Creator_1 Creator_int; BOOST_STATIC_ASSERT(( ::boost::is_same::value )); BOOST_STATIC_ASSERT(( ::boost::is_same >::value )); BOOST_STATIC_ASSERT(( ::boost::is_same >::value )); } int main(){ { - test_typedefs(); + test_typedefs(); { typedef CGAL::Cache Cache; double d; @@ -107,7 +93,7 @@ int main(){ typedef Cache::Reverse_iterator Reverse_iterator; typedef Cache::Const_reverse_iterator Const_reverse_iterator; typedef Cache::Size_type Size_type; - + Iterator it; d=0; for(it=cache.begin();it!=cache.end();it++){ @@ -131,7 +117,7 @@ int main(){ CGAL_test_assert(hi2==Int(4)); CGAL_test_assert(cache.size()==2); hi2=cache(3); - CGAL_test_assert(hi.id()==hi2.id()); + CGAL_test_assert(hi.id()==hi2.id()); } } diff --git a/STL_Extension/test/STL_Extension/test_Flattening_iterator.cpp b/STL_Extension/test/STL_Extension/test_Flattening_iterator.cpp index 67341204c20..dc1a378ba37 100644 --- a/STL_Extension/test/STL_Extension/test_Flattening_iterator.cpp +++ b/STL_Extension/test/STL_Extension/test_Flattening_iterator.cpp @@ -1,29 +1,13 @@ // ============================================================================ // -// Copyright (c) 2001-2006 Max-Planck-Institut Saarbruecken (Germany). -// All rights reserved. -// -// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/); -// you may redistribute it under the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with EXACUS. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// This software and related documentation is part of an INTERNAL release +// of the Computational Geometry Algorithms Library (CGAL). It is not +// intended for general use. // // ---------------------------------------------------------------------------- -// -// Library : LiS -// File : test/Flattening_iterator.C -// LiS_release : $Name: $ -// Revision : $Revision$ -// Revision_date : $Date$ -// -// Author(s) : Arno Eigenwillig -// -// ============================================================================ +// $URL$ +// $Id$ +// author(s) : Arno Eigenwillig #include #include diff --git a/STL_Extension/test/STL_Extension/test_Handle_with_policy.cpp b/STL_Extension/test/STL_Extension/test_Handle_with_policy.cpp index c38dcc7e3dd..66a2537c040 100644 --- a/STL_Extension/test/STL_Extension/test_Handle_with_policy.cpp +++ b/STL_Extension/test/STL_Extension/test_Handle_with_policy.cpp @@ -1,26 +1,12 @@ // ============================================================================ // -// Copyright (c) 2001-2006 Max-Planck-Institut Saarbruecken (Germany). -// All rights reserved. -// -// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/); -// you may redistribute it under the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with EXACUS. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// This software and related documentation is part of an INTERNAL release +// of the Computational Geometry Algorithms Library (CGAL). It is not +// intended for general use. // // ---------------------------------------------------------------------------- -// -// Library : LiS -// File : test/Handle.C -// LiS_release : $Name: $ -// Revision : $Revision$ -// Revision_date : $Date$ -// +// $URL$ +// $Id$ // Author(s) : Michael Seel // Arno Eigenwillig // Lutz Kettner @@ -52,11 +38,11 @@ struct Int_t : public ::CGAL::Handle_with_policy< Int_rep, Unify > { // test initialize_with this->initialize_with( i, j + k); } - - // This is needed to prevent VC7.1 and VC8 to call + + // This is needed to prevent VC7.1 and VC8 to call // the explicit templated constructor in Base instead of its copy-ctor. Int_t( Int_t const& rhs ) : Base( static_cast(rhs) ) {} - + int value() const { return this->ptr()->val; } void set_value( int i) { this->copy_on_write(); @@ -268,8 +254,8 @@ void test_handle() { template struct Int_vrep : public Policy::template Hierarchy_base< Alloc>::Type { int val; - virtual CGAL::Reference_counted_hierarchy* clone() { - return new Int_vrep( *this); + virtual CGAL::Reference_counted_hierarchy* clone() { + return new Int_vrep( *this); } virtual int get_val() const { return val; } virtual void set_val( int i) { val = i; } @@ -279,7 +265,7 @@ struct Int_vrep : public Policy::template Hierarchy_base< Alloc>::Type { template struct Int_vrep2 : public Int_vrep { int val2; - virtual ::CGAL::Reference_counted_hierarchy* clone() { + virtual ::CGAL::Reference_counted_hierarchy* clone() { return new Int_vrep2( *this); } virtual int get_val() const { return this->val + val2; } @@ -305,7 +291,7 @@ struct Int_vt : public ::CGAL::Handle_with_policy< Int_vrep, Unify Int_vt( int i, int j) : Base( new Int_vrep2(i,j)) {} Int_vt( int i, int j, int k) : Base( new Int_vrep3(i,j,k)) {} - // This is needed to prevent VC7.1 and VC8 to call + // This is needed to prevent VC7.1 and VC8 to call // the explicit templated constructor in Base instead of its copy-ctor. Int_vt( Int_vt const& rhs ) : Base( static_cast(rhs) ) {} @@ -326,7 +312,7 @@ struct Int_vt : public ::CGAL::Handle_with_policy< Int_vrep, Unify void test_handle_with_class_hierarchy() { { // test template constructor and initialize_with - typedef Int_vt< ::CGAL::Handle_policy_no_union> Int; + typedef Int_vt< ::CGAL::Handle_policy_no_union> Int; Int i(5,6); CGAL_test_assert( i == Int(11)); Int j(5,6,7); diff --git a/STL_Extension/test/STL_Extension/test_lexcompare_outputrange.cpp b/STL_Extension/test/STL_Extension/test_lexcompare_outputrange.cpp index 8dee61de6d5..a2903f384cc 100644 --- a/STL_Extension/test/STL_Extension/test_lexcompare_outputrange.cpp +++ b/STL_Extension/test/STL_Extension/test_lexcompare_outputrange.cpp @@ -1,26 +1,12 @@ // ============================================================================ // -// Copyright (c) 2001-2006 Max-Planck-Institut Saarbruecken (Germany). -// All rights reserved. -// -// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/); -// you may redistribute it under the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with EXACUS. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// This software and related documentation is part of an INTERNAL release +// of the Computational Geometry Algorithms Library (CGAL). It is not +// intended for general use. // // ---------------------------------------------------------------------------- -// -// Library : LiS -// File : test/algorithm_test.C -// LiS_release : $Name: $ -// Revision : $Revision$ -// Revision_date : $Date$ -// +// $URL$ +// $Id$ // Author(s) : Lutz Kettner // Arno Eigenwillig // @@ -67,7 +53,7 @@ void test_output_range() { CGAL_test_assert(os.str() == ""); CGAL_test_assert(sp == &os); os.str(""); - + sp = &(CGAL::output_range(os, A, A+1, ":", "(", ")")); CGAL_test_assert(os.str() == "(1)"); CGAL_test_assert(sp == &os); @@ -88,7 +74,7 @@ void test_output_range() { int main() { test_lex_compare(); test_output_range(); - + return EXIT_SUCCESS; }