Remove obsolete VC++ 6 specific code.

This commit is contained in:
Sylvain Pion 2008-01-20 15:27:47 +00:00
parent 796d4603bf
commit 5c551050a5
5 changed files with 5 additions and 32 deletions

View File

@ -36,7 +36,7 @@
// MSVC6 doesn't work with the CGALi::vector but it does with the std::vector
// (from stlport?)
#if (defined( _MSC_VER) && (_MSC_VER <= 1200)) || defined(__BORLANDC__)
#if defined(__BORLANDC__)
#include <vector>
#else
#include <CGAL/vector.h>
@ -47,7 +47,7 @@
namespace CGAL {
template <class Traits_>
#if (defined( _MSC_VER) && (_MSC_VER <= 1200)) || defined(__BORLANDC__)
#if defined(__BORLANDC__)
class Rotation_tree_2 : public std::vector< Rotation_tree_node_2<Traits_> >
#else
class Rotation_tree_2 : public CGALi::vector< Rotation_tree_node_2<Traits_> >
@ -56,7 +56,7 @@ class Rotation_tree_2 : public CGALi::vector< Rotation_tree_node_2<Traits_> >
public:
typedef Traits_ Traits;
typedef Rotation_tree_node_2<Traits> Node;
#if (defined( _MSC_VER) && (_MSC_VER <= 1200)) || defined(__BORLANDC__)
#if defined(__BORLANDC__)
typedef typename std::vector<Node>::iterator Self_iterator;
#else
typedef typename CGALi::vector<Node>::iterator Self_iterator;

View File

@ -35,7 +35,7 @@
#include <utility>
// MSVC6 doesn't work with the CGALi::vector but it does with the std::vector
// (from stlport?)
#if (defined( _MSC_VER) && (_MSC_VER <= 1200)) || defined(__BORLANDC__)
#if defined(__BORLANDC__)
#include <vector>
#else
#include <CGAL/vector.h>
@ -52,7 +52,7 @@ public:
typedef typename Traits::Point_2 Base_point;
typedef Rotation_tree_node_2<Traits> Self;
#if (defined( _MSC_VER) && (_MSC_VER <= 1200)) || defined(__BORLANDC__)
#if defined(__BORLANDC__)
typedef std::vector< Self > Tree;
#else
typedef CGALi::vector< Self > Tree;

View File

@ -25,10 +25,6 @@
#ifndef CGAL_VECTOR_H
#define CGAL_VECTOR_H 1
#if defined( _MSC_VER) && (_MSC_VER <= 1200)
#error CGAL::vector not available on MSC VC6
#else
#include <CGAL/basic.h>
#include <CGAL/memory.h>
#include <iterator>
@ -36,12 +32,10 @@
#include <memory>
#include <cstddef>
CGAL_BEGIN_NAMESPACE
namespace CGALi {
// We give the vector container class a class based iterator implementation.
// It ensures that iterator_traits work on compilers not supporting
// partial specializations and it guarantees that default initialization
@ -601,7 +595,4 @@ void vector<T, Alloc>::insert( iterator position, size_type n, const T& x) {
CGAL_END_NAMESPACE
#endif // defined( _MSC_VER) && (_MSC_VER <= 1200)
#endif // CGAL_VECTOR_H //
// EOF //

View File

@ -25,13 +25,6 @@
// A test for the CGAL::Multiset container.
// ============================================================================
#if defined( _MSC_VER) && (_MSC_VER <= 1200)
// CGAL::vector not available on MSC VC6
int main() {
return (0);
}
#else
#include <CGAL/basic.h>
#include <CGAL/Multiset.h>
#include <string>
@ -644,5 +637,3 @@ void test_swap_and_replace ()
return;
}
#endif // defined( _MSC_VER) && (_MSC_VER <= 1200) //

View File

@ -28,13 +28,6 @@
// with templates.
// ============================================================================
#if defined( _MSC_VER) && (_MSC_VER <= 1200)
// CGAL::vector not available on MSC VC6
int main() {
return 0;
}
#else
#include <CGAL/vector.h>
#include <CGAL/Testsuite/assert.h>
#include <iostream>
@ -204,5 +197,3 @@ int main() {
return 0;
}
#endif // defined( _MSC_VER) && (_MSC_VER <= 1200) //