songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove package namespace macro

This commit is contained in:
Sébastien Loriot 2010-06-09 08:45:58 +00:00
parent 52317dd49f
commit d53e01f1a1
355 changed files with 758 additions and 826 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h
View File

@ -28,7 +28,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//--------------------------------------------------------------------
@ -95,7 +95,7 @@ public:
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_weight_2.h
View File

@ -28,7 +28,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
template<class K>
class Compare_weight_2
@ -49,7 +49,7 @@ public:
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_x_2.h
View File

@ -28,7 +28,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
template<class K>
class Compare_x_2
@ -49,7 +49,7 @@ public:
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_y_2.h
View File

@ -28,7 +28,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
template<class K>
class Compare_y_2
@ -49,7 +49,7 @@ public:
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_C2.h
View File

@ -36,7 +36,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//***********************************************************************
//***********************************************************************
@ -427,7 +427,7 @@ public:
};
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_ftC2.h
View File

@ -27,7 +27,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
template < class FT >
inline
@ -179,7 +179,7 @@ ad_left_bitangent_lineC2(const FT &x1, const FT &y1, const FT &w1,
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Conflict_2.h
View File

@ -27,7 +27,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//-----------------------------------------------------------------------
// Conflict Base
@ -181,7 +181,7 @@ protected:
};
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Edge_conflict_2.h
View File

@ -27,7 +27,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//-----------------------------------------------------------------------
// Edge Conflict Base
@ -104,7 +104,7 @@ protected:
}
};
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Finite_edge_conflict_2.h
View File

@ -26,7 +26,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//-----------------------------------------------------------------------
// Finite edge interior conflict
@ -83,7 +83,7 @@ public:
}
};
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Infinite_edge_conflict_2.h
View File

@ -27,7 +27,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//-----------------------------------------------------------------------
// Infinite edge interior conflict
@ -62,7 +62,7 @@ public:
};
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Orientation_2.h
View File

@ -27,7 +27,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
template <class K, class MTag>
@ -92,7 +92,7 @@ public:
}
};
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Delage_traits/Vertex_conflict_2.h
View File

@ -28,7 +28,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//-----------------------------------------------------------------------
// Vertex conflict
@ -320,7 +320,7 @@ public:
}
};
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test8_C2.h
View File

@ -28,7 +28,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//--------------------------------------------------------------------
//--------------------------------------------------------------------
@ -749,7 +749,7 @@ public:
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h
View File

@ -31,7 +31,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//--------------------------------------------------------------------
@ -629,7 +629,7 @@ public:
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle8_C2.h
View File

@ -27,7 +27,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//--------------------------------------------------------------------
@ -127,7 +127,7 @@ public:
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle_C2.h
View File

@ -31,7 +31,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//--------------------------------------------------------------------
@ -239,7 +239,7 @@ public:
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h
View File

@ -29,7 +29,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//--------------------------------------------------------------------
@ -312,7 +312,7 @@ public:
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_degenerate_edge_C2.h
View File

@ -31,7 +31,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//--------------------------------------------------------------------
@ -92,7 +92,7 @@ public:
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_hidden_C2.h
View File

@ -27,7 +27,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//--------------------------------------------------------------------
@ -81,7 +81,7 @@ public:
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Kernel_wrapper_2.h
View File

@ -29,7 +29,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
template<class Kernel_base_2>
class Apollonius_graph_kernel_wrapper_2 : public Kernel_base_2
@ -78,7 +78,7 @@ public:
};
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation8_C2.h
View File

@ -27,7 +27,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
template<class K, class MTag>
class Orientation8_C2
@ -315,7 +315,7 @@ public:
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation_2.h
View File

@ -30,7 +30,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
template<class K, class MTag>
class Orientation_2
@ -106,7 +106,7 @@ public:
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h
View File

@ -27,7 +27,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
//--------------------------------------------------------------------
@ -121,7 +121,7 @@ public:
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicate_constructions_C2.h
View File

@ -26,7 +26,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
template< class K >
class Inverted_weighted_point_2
@ -355,7 +355,7 @@ public:
}
};
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Traits_wrapper_2.h
View File

@ -29,7 +29,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
template<class Gt_base>
@ -46,7 +46,7 @@ public:
};
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

5
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/basic.h
View File

@ -25,10 +25,5 @@
#define CGAL_APOLLONIUS_GRAPH_2_NS CGAL::ApolloniusGraph_2
#define CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE \
namespace ApolloniusGraph_2 {
#define CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE }
#endif // CGAL_APOLLONIUS_GRAPH_2_BASIC_H

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/comparator_profiler.h
View File

@ -26,7 +26,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
class comparator_profiler
{
@ -158,7 +158,7 @@ unsigned long comparator_profiler::counter_rr_e = 0;
unsigned long comparator_profiler::counter_rr_r0 = 0;
//unsigned long comparator_profiler::counter_rr_jneg = 0;
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/compare_quadratic.h
View File

@ -27,7 +27,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
#ifdef COMPARATOR_PROFILER
#include <CGAL/Apollonius_graph_2/comparator_profiler.h>
@ -983,7 +983,7 @@ ke_compare_r1_r2_filtered(const CT& a1, const CT& b1, const CT& c1,
//--------------------------------------------------------------------
//--------------------------------------------------------------------
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/predicate_profiler.h
View File

@ -28,7 +28,7 @@
namespace CGAL {
CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
namespace ApolloniusGraph_2 {
class ag2_predicate_profiler
{
@ -71,7 +71,7 @@ unsigned long ag2_predicate_profiler::shadow_region_type_counter = 0;
unsigned long ag2_predicate_profiler::incircle_counter = 0;
unsigned long ag2_predicate_profiler::order_on_bisector_counter = 0;
CGAL_APOLLONIUS_GRAPH_2_END_NAMESPACE
} //namespace ApolloniusGraph_2
} //namespace CGAL

4
Arrangement_on_surface_2/benchmarks/Arrangement_on_surface_2/Double.hpp
View File

@ -7,7 +7,7 @@
#define ZERO_EPSILON 0.000001
#define ERR_EPSILON 0.001
CGAL_BEGIN_NAMESPACE
namespace CGAL {
class Double {
public:
@ -262,6 +262,6 @@ public:
#endif
};
CGAL_END_NAMESPACE
} //namespace CGAL
#endif

4
Core/include/CGAL/CORE/BigFloat.h
View File

@ -36,7 +36,7 @@
#include <CGAL/CORE/BigFloatRep.h>
CORE_BEGIN_NAMESPACE
namespace CORE {
class Expr;
@ -616,5 +616,5 @@ inline BigFloat gcd(const BigFloat& a, const BigFloat& b) {
inline BigRat::BigRat(const BigFloat& f) : RCBigRat(new BigRatRep()){
*this = f.BigRatValue();
}
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_BIGFLOAT_H_

4
Core/include/CGAL/CORE/BigFloatRep.h
View File

@ -39,7 +39,7 @@
#include <CGAL/CORE/CoreDefs.h>
#include <CGAL/CORE/extLong.h>
CORE_BEGIN_NAMESPACE
namespace CORE {
// forward reference
class BigFloat;
@ -442,5 +442,5 @@ inline void BigFloatRep::dump() const {
std::cout << " -- End of BFRep " << this << " -- " << std::endl;
}
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_BIGFLOATREP_H_

4
Core/include/CGAL/CORE/BigInt.h
View File

@ -38,7 +38,7 @@
#include <CGAL/CORE/MemoryPool.h>
#include <string>
CORE_BEGIN_NAMESPACE
namespace CORE {
class BigIntRep : public RCRepImpl<BigIntRep> {
@ -557,5 +557,5 @@ inline BigInt randomize(const BigInt& a) {
}
//@}
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_BIGINT_H_

4
Core/include/CGAL/CORE/BigRat.h
View File

@ -36,7 +36,7 @@
#include <CGAL/CORE/BigInt.h>
CORE_BEGIN_NAMESPACE
namespace CORE {
class BigRatRep : public RCRepImpl<BigRatRep> {
public:
@ -484,5 +484,5 @@ inline BigInt BigIntValue(const BigRat& a) {
return a.BigIntValue();
}
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_BIGRAT_H_

4
Core/include/CGAL/CORE/CoreAux.h
View File

@ -38,7 +38,7 @@
#include <fstream>
#include "CGAL/CORE/Impl.h"
CORE_BEGIN_NAMESPACE
namespace CORE {
#ifndef LONG_BIT // such as in Linux
#define LONG_BIT (sizeof(long) * 8)
@ -178,5 +178,5 @@ inline void core_debug(std::string msg){
}
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_COREAUX_H_

4
Core/include/CGAL/CORE/CoreDefs.h
View File

@ -39,7 +39,7 @@
#include <CGAL/CORE/extLong.h>
CORE_BEGIN_NAMESPACE
namespace CORE {
//////////////////////////////////////////////////////////////
// defined constants
@ -249,5 +249,5 @@ inline void setPositionalFormat(std::ostream& o = std::cout) {
o.setf(std::ios::fixed, std::ios::floatfield);
}
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_COREDEFS_H_

4
Core/include/CGAL/CORE/Expr.h
View File

@ -40,7 +40,7 @@
#include <CGAL/CORE/ExprRep.h>
CORE_BEGIN_NAMESPACE
namespace CORE {
/// \class Expr Expr.h
/// \brief Expr is a class of Expression in Level 3
@ -544,5 +544,5 @@ inline Expr radical(const NT& n, int m) {
// because otherwise VC++.net2003 can't compile Expr.cpp
#include <CGAL/CORE/poly/Poly.tcc>
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_EXPR_H_

4
Core/include/CGAL/CORE/ExprRep.h
View File

@ -42,7 +42,7 @@
#include <CGAL/CORE/Filter.h>
#include <CGAL/CORE/poly/Sturm.h>
CORE_BEGIN_NAMESPACE
namespace CORE {
#ifdef CORE_DEBUG_BOUND
// These counters are incremented each time each bound is recognized as equal
@ -1309,5 +1309,5 @@ inline BigFloat ExprRep::BigFloatValue() {
return getAppValue().BigFloatValue();
}
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_EXPRREP_H_

4
Core/include/CGAL/CORE/Filter.h
View File

@ -52,7 +52,7 @@
#include <ieeefp.h>
#endif
CORE_BEGIN_NAMESPACE
namespace CORE {
const int POWTWO_26 = (1 << 26); ///< constant 2^26
@ -187,5 +187,5 @@ inline std::ostream & operator<< (std::ostream & os, const filteredFp& fp) {
return os;
}
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_FILTER_H_

4
Core/include/CGAL/CORE/Gmp.h
View File

@ -5,7 +5,7 @@
#include <CGAL/CORE/Impl.h>
#include <gmp.h>
CORE_BEGIN_NAMESPACE
namespace CORE {
std::ostream& io_write (std::ostream &, mpz_srcptr);
std::ostream& io_write (std::ostream &, mpq_srcptr);
@ -16,5 +16,5 @@ std::istream& io_read (std::istream &, mpq_ptr);
//std::istream& operator>> (std::istream &, mpz_ptr);
//std::istream& operator>> (std::istream &, mpq_ptr);
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_GMP_H_

4
Core/include/CGAL/CORE/Impl.h
View File

@ -11,10 +11,6 @@
#pragma warning(disable: 4244)
#endif
// macros for defining namespace
#define CORE_BEGIN_NAMESPACE namespace CORE {
#define CORE_END_NAMESPACE }
// condition preprocessor for inline function
#ifndef CORE_DISABLE_INLINE
#define CORE_INLINE inline

4
Core/include/CGAL/CORE/MemoryPool.h
View File

@ -36,7 +36,7 @@
#include <new> // for placement new
#include <cassert>
CORE_BEGIN_NAMESPACE
namespace CORE {
#define CORE_EXPANSION_SIZE 1024
template< class T, int nObjects = CORE_EXPANSION_SIZE >
@ -103,6 +103,6 @@ void MemoryPool< T, nObjects >::free(void* t) {
head = reinterpret_cast<Thunk*>(t);
}
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_MEMORYPOOL_H_

4
Core/include/CGAL/CORE/Promote.h
View File

@ -40,7 +40,7 @@
#include <CGAL/CORE/Impl.h>
CORE_BEGIN_NAMESPACE
namespace CORE {
/// hasExactDivision()
/// CHECKING if NT has exact division
@ -152,6 +152,6 @@ DEFINE_MAX_TYPE(BigFloat, Expr, Expr)
DEFINE_MAX_TYPE(BigRat, Expr, Expr)
CORE_END_NAMESPACE
} //namespace CORE
#endif //__PROMOTE_H__

4
Core/include/CGAL/CORE/Real.h
View File

@ -38,7 +38,7 @@
#define _CORE_REAL_H_
#include "RealRep.h"
CORE_BEGIN_NAMESPACE
namespace CORE {
// class Real
typedef RCImpl<RealRep> RCReal;
class Real : public RCReal {
@ -490,5 +490,5 @@ inline Real RealLong::operator-() const {
return ker < -LONG_MAX ? -BigInt(ker) : -ker;
}
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_REAL_H_

4
Core/include/CGAL/CORE/RealRep.h
View File

@ -36,7 +36,7 @@
#define _CORE_REALREP_H_
#include "BigFloat.h"
CORE_BEGIN_NAMESPACE
namespace CORE {
class Real;
@ -509,5 +509,5 @@ inline std::string RealBigFloat::toString(long prec, bool sci) const {
return ker.toString(prec, sci);
}
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_REALREP_H_

4
Core/include/CGAL/CORE/RefCount.h
View File

@ -56,7 +56,7 @@
#ifndef _CORE_REFCOUNT_H_
#define _CORE_REFCOUNT_H_
CORE_BEGIN_NAMESPACE
namespace CORE {
template<class Deriving>
class RCRepImpl {
@ -110,5 +110,5 @@ public:
#endif
};
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_REFCOUNT_H_

4
Core/include/CGAL/CORE/Timer.h
View File

@ -46,7 +46,7 @@
#include <CGAL/CORE/Impl.h>
#include <ctime>
CORE_BEGIN_NAMESPACE
namespace CORE {
class Timer {
private:
@ -73,5 +73,5 @@ public:
}
};
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_TIMER_H_

4
Core/include/CGAL/CORE/extLong.h
View File

@ -40,7 +40,7 @@
#include <CGAL/CORE/Impl.h>
#include <CGAL/CORE/CoreAux.h>
CORE_BEGIN_NAMESPACE
namespace CORE {
#ifndef LONG_MAX
#error "haven't define LONG_MAX"
@ -290,5 +290,5 @@ inline bool extLong::isNaN() const {
return (flag == 2);
}
CORE_END_NAMESPACE
} //namespace CORE
#endif // _CORE_EXTLONG_H_

4
Core/include/CGAL/CORE/poly/Curves.h
View File

@ -74,7 +74,7 @@
#include <list>
#include "CGAL/CORE/poly/Poly.h"
CORE_BEGIN_NAMESPACE
namespace CORE {
// ==================================================
// Curve Class
@ -519,7 +519,7 @@ void showIntervals(char* s, BFVecInterval &vI);
#include <CGAL/CORE/poly/Curves.tcc>
CORE_END_NAMESPACE
} //namespace CORE
#endif
/*************************************************************************** */
// END

4
Core/include/CGAL/CORE/poly/Poly.h
View File

@ -60,7 +60,7 @@
#include <CGAL/CORE/Promote.h>
#include <vector>
CORE_BEGIN_NAMESPACE
namespace CORE {
using namespace std;
class Expr;
// ==================================================
@ -430,5 +430,5 @@ bool Polynomial<NT>::setCoeff(int i, const NT & cc) {
// We include this file from CORE/Expr.h, AFTER the definition
// of class Expr, because otherwise VC++.net2003 can'y compile Expr.cpp
CORE_END_NAMESPACE
} //namespace CORE
#endif

4
Core/include/CGAL/CORE/poly/Sturm.h
View File

@ -62,7 +62,7 @@
#include "CGAL/CORE/Expr.h"
#include "CGAL/CORE/poly/Poly.h"
CORE_BEGIN_NAMESPACE
namespace CORE {
// ==================================================
// Sturm Class
@ -1143,6 +1143,6 @@ CORE_INLINE void testNewtonSturm(const Polynomial<NT>&P, int prec, int n = -1) {
}
}// testNewtonSturm
CORE_END_NAMESPACE
} //namespace CORE
#endif

4
Core/src/CGALCore/BigFloat.cpp
View File

@ -44,7 +44,7 @@
#include <CGAL/CORE/BigFloat.h>
#include <CGAL/CORE/Expr.h>
CORE_BEGIN_NAMESPACE
namespace CORE {
////////////////////////////////////////////////////////////
@ -1283,4 +1283,4 @@ BigFloat root(const BigFloat& x, unsigned long k,
}
}//root
CORE_END_NAMESPACE
} //namespace CORE

4
Core/src/CGALCore/CoreAux.cpp
View File

@ -35,7 +35,7 @@
#include "CGAL/CORE/CoreAux.h"
#include <gmp.h>
CORE_BEGIN_NAMESPACE
namespace CORE {
////////////////////////////////////////////////////////////
// More useful functions to implement:
@ -209,4 +209,4 @@ void core_error(std::string msg, std::string file, int lineno, bool err) {
}
CORE_END_NAMESPACE
} //namespace CORE

4
Core/src/CGALCore/CoreDefs.cpp
View File

@ -33,7 +33,7 @@
#include "CGAL/CORE/CoreDefs.h"
CORE_BEGIN_NAMESPACE
namespace CORE {
// Default Values
@ -150,5 +150,5 @@ long defInitialProgressivePrec = 64;
* true = turn on rational reduction */
bool rationalReduceFlag = false;
CORE_END_NAMESPACE
} //namespace CORE

4
Core/src/CGALCore/CoreIO.cpp
View File

@ -31,7 +31,7 @@
#include <CGAL/CORE/BigFloatRep.h>
#include <CGAL/CORE/BigFloat.h>
CORE_BEGIN_NAMESPACE
namespace CORE {
void core_io_error_handler(const char *f, const char *m) {
std::cout << "\n error_handler";
@ -453,5 +453,5 @@ void BigFloat::write_to_file2(std::ostream& out, int base, int charsPerLine) {
}
*/
CORE_END_NAMESPACE
} //namespace CORE

4
Core/src/CGALCore/Expr.cpp
View File

@ -36,7 +36,7 @@
#include <CGAL/CORE/Expr.h>
#include <cmath>
CORE_BEGIN_NAMESPACE
namespace CORE {
#ifdef CORE_DEBUG_BOUND
unsigned int BFMSS_counter = 0;
@ -1148,4 +1148,4 @@ void BinOpRep::debugTree(int level, int indent, int depthLimit) const {
second->debugTree(level, indent + 2, depthLimit - 1);
}
CORE_END_NAMESPACE
} //namespace CORE

4
Core/src/CGALCore/GmpIO.cpp
View File

@ -41,7 +41,7 @@ MA 02110-1301, USA. */
using namespace std;
CORE_BEGIN_NAMESPACE
namespace CORE {
int
__gmp_istream_set_base (istream &i, char &c, bool &zero, bool &showbase)
@ -255,4 +255,4 @@ io_write (ostream &o, mpq_srcptr q)
return o << mpq_get_str (0, 10, q);
}
CORE_END_NAMESPACE
} //namespace CORE

4
Core/src/CGALCore/Real.cpp
View File

@ -37,7 +37,7 @@
#include <ctype.h>
#include <CGAL/CORE/Real.h>
CORE_BEGIN_NAMESPACE
namespace CORE {
const Real& Real::getZero() {
static Real Zero(0);
@ -265,4 +265,4 @@ std::istream& operator >>(std::istream& i, Real& x) {
return i;
}//operator >> (std::istream&, Real&)
CORE_END_NAMESPACE
} //namespace CORE

4
Core/src/CGALCore/extLong.cpp
View File

@ -40,7 +40,7 @@
#include <CGAL/CORE/extLong.h>
CORE_BEGIN_NAMESPACE
namespace CORE {
const extLong& extLong::getNaNLong() {
static extLong NaNLong(true);
@ -191,4 +191,4 @@ std::ostream& operator<< (std::ostream& o, const extLong& x) {
return o;
}
CORE_END_NAMESPACE
} //namespace CORE

5
Developers_manual/doc_tex/Developers_manual/namespaces.tex
View File

@ -82,10 +82,7 @@ my_new_function( My_new_cgal_class& );
Make sure not to have include statements nested between
\verb+ namespace CGAL { + and \verb+ } // namespace CGAL+.
Otherwise all names defined in the file included will be
added to namespace \ccc{CGAL}. (Some people use the macros
\ccc{CGAL_BEGIN_NAMESPACE} and \ccc{CGAL_END_NAMESPACE}
in place of the \texttt{namespace CGAL \{} and
\texttt{\} // namespace CGAL}, respectively, for better readability.)
added to namespace \ccc{CGAL}.
\section{Namespace {\tt internal}}
\ccIndexSubitem{namespace}{\ccFont internal}

8
Kernel_d/noweb/Aff_transformationHd.lw
View File

@ -33,12 +33,12 @@
#include <CGAL/Kernel_d/DirectionHd.h>
#include <CGAL/Kernel_d/HyperplaneHd.h>
CGAL_BEGIN_NAMESPACE
namespace CGAL {
<<defining Aff_transformationHd_rep>>
<<defining Aff_transformationHd>>
CGAL_END_NAMESPACE
} //namespace CGAL
#endif // CGAL_AFF_TRANSFORMATIONHD_H
@ The implementation file contains the following.
@ -51,11 +51,11 @@ CGAL_END_NAMESPACE
#ifndef CGAL_AFF_TRANSFORMATIONHD_C
#define CGAL_AFF_TRANSFORMATIONHD_C
CGAL_BEGIN_NAMESPACE
namespace CGAL {
<<implementing Aff_transformationHd>>
CGAL_END_NAMESPACE
} //namespace CGAL
#endif // CGAL_AFF_TRANSFORMATIONHD_C
@ \subsection{The Representation Class}

4
Kernel_d/noweb/function_objectsCd.lw
View File

@ -654,7 +654,7 @@ OutputIterator operator()(ForwardIterator first, ForwardIterator last,
#define TRACEN(t) std::cerr << t << std::endl
#define TRACEV(t) std::cerr << #t << " = " << (t) << std::endl
CGAL_BEGIN_NAMESPACE
namespace CGAL {
<<Lift_to_paraboloidCd function object>>
<<Project_along_d_axisCd function object>>
@ -676,7 +676,7 @@ CGAL_BEGIN_NAMESPACE
<<Linearly_independentCd function object>>
<<Linear_baseCd function object>>
CGAL_END_NAMESPACE
} //namespace CGAL
#endif //CGAL_FUNCTION_OBJECTSCD_H
@

4
Kernel_d/noweb/function_objectsHd.lw
View File

@ -661,7 +661,7 @@ OutputIterator operator()(ForwardIterator first, ForwardIterator last,
#include <CGAL/basic.h>
#include <CGAL/enum.h>
CGAL_BEGIN_NAMESPACE
namespace CGAL {
<<Lift_to_paraboloidHd function object>>
<<Project_along_d_axisHd function object>>
@ -683,7 +683,7 @@ CGAL_BEGIN_NAMESPACE
<<Linearly_independentHd function object>>
<<Linear_baseHd function object>>
CGAL_END_NAMESPACE
} //namespace CGAL
#endif //CGAL_FUNCTION_OBJECTSHD_H
@

12
Kernel_d/noweb/intersection_objects_d.lw
View File

@ -1000,11 +1000,11 @@ Segment_d_Hyperplane_d_pair<R>::intersection(Segment_d& s)
#include <CGAL/basic.h>
CGAL_BEGIN_NAMESPACE
namespace CGAL {
<<homogeneous intersection working horses>>
CGAL_END_NAMESPACE
} //namespace CGAL
#include <CGAL/Kernel_d/intersection_objects_d.h>
@ -1019,11 +1019,11 @@ CGAL_END_NAMESPACE
#define _DEBUG 11
#include <CGAL/Kernel_d/debug.h>
CGAL_BEGIN_NAMESPACE
namespace CGAL {
<<cartesian intersection working horses>>
CGAL_END_NAMESPACE
} //namespace CGAL
#include <CGAL/Kernel_d/intersection_objects_d.h>
@ -1035,7 +1035,7 @@ CGAL_END_NAMESPACE
#ifndef CGAL_INTERSECTION_OBJECTS_D_H
#define CGAL_INTERSECTION_OBJECTS_D_H
CGAL_BEGIN_NAMESPACE
namespace CGAL {
<<line line intersection>>
<<line ray intersection>>
@ -1047,7 +1047,7 @@ CGAL_BEGIN_NAMESPACE
<<ray hyperplane intersection>>
<<segment hyperplane intersection>>
CGAL_END_NAMESPACE
} //namespace CGAL
#endif //CGAL_INTERSECTION_OBJECTS_D_H
@ \end{document}

4
Kinetic_data_structures/demo/Kinetic_data_structures/include/Qt_Delaunay_stable_subset_2.h
View File

@ -7,7 +7,7 @@
#include <CGAL/Kinetic/internal/tds_2_helpers.h>
#include <CGAL/Kinetic/Listener.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
//! This class draws a Kinetic_Delaunay_2 triangulation to a Qt_gui_2.
/*! The most recently created edges are colored green and the other
@ -143,5 +143,5 @@ protected:
double threshold_;
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_points_3.h
View File

@ -42,7 +42,7 @@
#include <Inventor/nodes/SoTransform.h>
#include <Inventor/sensors/SoOneShotSensor.h>
CGAL_KINETIC_BEGIN_NAMESPACE;
namespace CGAL { namespace Kinetic {;
//! A graphical moving point set in 3D
/*!
@ -461,5 +461,5 @@ void SoQt_moving_points_3<Tr, G>::write(std::ostream &out) const
}
CGAL_KINETIC_END_NAMESPACE;
} } //namespace CGAL::Kinetic;
#endif // guard

4
Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_moving_weighted_points_3.h
View File

@ -44,7 +44,7 @@
#include <Inventor/nodes/SoEventCallback.h>
#include <Inventor/sensors/SoOneShotSensor.h>
CGAL_KINETIC_BEGIN_NAMESPACE;
namespace CGAL { namespace Kinetic {;
//! A graphical moving point set in 3D
/*!
@ -450,5 +450,5 @@ void SoQt_moving_weighted_points_3<T,G>::write(std::ostream &out) const
}
CGAL_KINETIC_END_NAMESPACE;
} } //namespace CGAL::Kinetic;
#endif // guard

4
Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_triangulation_3.h
View File

@ -46,7 +46,7 @@
#include <CGAL/Kinetic/internal/triangulation_helpers_3.h>
#include <CGAL/Kinetic/Ref_counted.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
//! A class to display a 3D triangulation.
/*!
@ -423,5 +423,5 @@ void SoQt_triangulation_3<K,G,M>::generate_geometry()
//wa.apply(parent_.get());
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/demo/Kinetic_data_structures/include/SoQt_widget_3.h
View File

@ -32,7 +32,7 @@
class SoSeparator;
CGAL_KINETIC_BEGIN_NAMESPACE;
namespace CGAL { namespace Kinetic {;
//! This provides a GUI in 3D using Coin.
/*! If you want to draw something, extend
@ -177,5 +177,5 @@ protected:
Window_listener window_l_;
};
CGAL_KINETIC_END_NAMESPACE;
} } //namespace CGAL::Kinetic;
#endif // qt

4
Kinetic_data_structures/hidden/include/CGAL/Kinetic/Active_objects_set.h
View File

@ -33,7 +33,7 @@
#include <boost/iterator/transform_iterator.hpp>
#include <utility>
CGAL_KINETIC_BEGIN_NAMESPACE;
namespace CGAL { namespace Kinetic {;
//! Holds a set of moving points and creates notifications when changes occur.
/*! This container holds a set of objects of a particular type. It
@ -357,5 +357,5 @@ inline std::istream &operator>>(std::istream &in, Active_objects_set<V> &v) {
return v.read(in);
}
CGAL_KINETIC_END_NAMESPACE;
} } //namespace CGAL::Kinetic;
#endif

4
Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_1.h
View File

@ -22,7 +22,7 @@
#define CGAL_KINETIC_EXACT_SIMULATION_1_H
#include <CGAL/Kinetic/Simulation_traits.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
struct Exact_simulation_traits_1: public Suggested_exact_simulation_traits_base {
typedef Suggested_exact_simulation_traits_base P;
@ -46,5 +46,5 @@ struct Exact_simulation_traits_1: public Suggested_exact_simulation_traits_base
protected:
Active_points_1_table::Handle ap_;
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_2.h
View File

@ -22,7 +22,7 @@
#define CGAL_KINETIC_EXACT_SIMULATION_2_H
#include <CGAL/Kinetic/Simulation_traits.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
struct Exact_simulation_traits_2: public Suggested_exact_simulation_traits_base {
typedef Suggested_exact_simulation_traits_base P;
typedef Active_objects_vector<P::Kinetic_kernel::Point_2> Active_points_2_table;
@ -45,5 +45,5 @@ struct Exact_simulation_traits_2: public Suggested_exact_simulation_traits_base
protected:
Active_points_2_table::Handle ap_;
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/hidden/include/CGAL/Kinetic/Exact_simulation_traits_3.h
View File

@ -22,7 +22,7 @@
#define CGAL_KINETIC_EXACT_SIMULATION_3_H
#include <CGAL/Kinetic/Simulation_traits.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
struct Exact_simulation_traits_3: public Suggested_exact_simulation_traits_base {
typedef Suggested_exact_simulation_traits_base P;
@ -46,5 +46,5 @@ struct Exact_simulation_traits_3: public Suggested_exact_simulation_traits_base
protected:
Active_points_3_table::Handle ap_;
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_1.h
View File

@ -23,7 +23,7 @@
#include <CGAL/Kinetic/Simulation_traits.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
struct Inexact_simulation_traits_1: public Suggested_inexact_simulation_traits_base {
typedef Suggested_inexact_simulation_traits_base P;
@ -47,5 +47,5 @@ struct Inexact_simulation_traits_1: public Suggested_inexact_simulation_traits_b
protected:
Active_points_1_table::Handle ap_;
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_2.h
View File

@ -23,7 +23,7 @@
#include <CGAL/Kinetic/Simulation_traits.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
struct Inexact_simulation_traits_2: public Suggested_inexact_simulation_traits_base {
typedef Suggested_inexact_simulation_traits_base P;
@ -48,5 +48,5 @@ protected:
Active_points_2_table::Handle ap_;
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/hidden/include/CGAL/Kinetic/Inexact_simulation_traits_3.h
View File

@ -24,7 +24,7 @@
#include <CGAL/Kinetic/Simulation_traits.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
struct Inexact_simulation_traits_3: public Suggested_inexact_simulation_traits_base {
typedef Suggested_inexact_simulation_traits_base P;
@ -49,5 +49,5 @@ protected:
Active_points_3_table::Handle ap_;
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

8
Kinetic_data_structures/hidden/include/CGAL/Kinetic/Interval_simulator_traits.h
View File

@ -4,7 +4,7 @@
#include <CGAL/Kinetic/Ref_counted.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
template <class Refiner>
class Interval_root {
@ -209,7 +209,7 @@ std::pair<double,double> to_interval(const Interval_root<D>& a) {
}*/
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
namespace CGAL {
@ -244,7 +244,7 @@ namespace std {
};
};
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
template <class Data>
struct Interval_simulator_traits {
@ -302,6 +302,6 @@ struct Interval_simulator_traits {
}
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/hidden/include/CGAL/Kinetic/Simulation_traits.h
View File

@ -47,7 +47,7 @@
#define CGAL_KINETIC_USE_CORE
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
template <class StaticKernel,
class KineticKernel,
@ -183,5 +183,5 @@ struct Suggested_inexact_simulation_traits_base: public Simulation_traits<Sugges
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/hidden/include/CGAL/Polynomial/Default_filtering_traits.h
View File

@ -26,7 +26,7 @@
#include <CGAL/Polynomial/polynomial_converters.h>
CGAL_POLYNOMIAL_BEGIN_NAMESPACE
namespace CGAL { namespace POLYNOMIAL {
template <class NT = Default_field_nt>
struct Default_filtering_traits
{
@ -37,7 +37,7 @@ struct Default_filtering_traits
To_interval<NT> > Exact_to_interval_converter;
};
CGAL_POLYNOMIAL_END_NAMESPACE
} } //namespace CGAL::POLYNOMIAL
#ifdef CGAL_DEFAULT_FILTERING_DEFAULT_NT
#undef CGAL_DEFAULT_FILTERING_DEFAULT_NT

4
Kinetic_data_structures/hidden/include/CGAL/Polynomial/Filtered_kernel.h
View File

@ -30,7 +30,7 @@
#include <CGAL/Polynomial/internal/Kernel/Is_rational.h>
#include <CGAL/Polynomial/internal/Kernel/To_rational.h>
CGAL_POLYNOMIAL_BEGIN_NAMESPACE
namespace CGAL { namespace POLYNOMIAL {
//! A filtered polynomial kernel.
/*!
@ -107,5 +107,5 @@ class Filtered_kernel: public internal::Filtered_rational_traits<Traits_t>
Root_stack_traits ret_;
};
CGAL_POLYNOMIAL_END_NAMESPACE
} } //namespace CGAL::POLYNOMIAL
#endif

8
Kinetic_data_structures/hidden/include/CGAL/Polynomial/Lazy_upper_bound_root_stack.h
View File

@ -24,7 +24,7 @@
#include <CGAL/Kinetic/Ref_counted.h>
#include <CGAL/Polynomial/internal/interval_arithmetic.h>
CGAL_POLYNOMIAL_BEGIN_INTERNAL_NAMESPACE
namespace CGAL { namespace POLYNOMIAL { namespace internal {
/*
Root has pointer to Root_rep, solver_rep (ref counted), a double approximation;
@ -255,8 +255,8 @@ std::ostream& operator<<(std::ostream &out, const Lazy_upper_bound_root_stack_ro
}
CGAL_POLYNOMIAL_END_INTERNAL_NAMESPACE
CGAL_POLYNOMIAL_BEGIN_NAMESPACE
} } } //namespace CGAL::POLYNOMIAL::internal
namespace CGAL { namespace POLYNOMIAL {
/*template <class Rep, class Solver_rep>
double to_double(const Lazy_upper_bound_root_stack_root<Rep, Solver_rep> &rt){
@ -553,7 +553,7 @@ struct Lazy_upper_bound_root_stack<Traits_t>::Root_rep: public CGAL::Kinetic::Re
};*/
CGAL_POLYNOMIAL_END_NAMESPACE
} } //namespace CGAL::POLYNOMIAL
namespace CGAL
{

4
Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack.h
View File

@ -31,7 +31,7 @@
#define CGAL_DSPRINT(x)
CGAL_POLYNOMIAL_BEGIN_NAMESPACE
namespace CGAL { namespace POLYNOMIAL {
//! A Solver which uses
template <class Traits_t>
class Upper_bound_root_stack
@ -479,6 +479,6 @@ protected:
Sturm_root_counter ss_;
bool has_ss_;
};
CGAL_POLYNOMIAL_END_NAMESPACE
} } //namespace CGAL::POLYNOMIAL
#endif

4
Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack_Descartes_traits.h
View File

@ -27,7 +27,7 @@
#include <CGAL/Polynomial/internal/Rational/Sturm_root_counter.h>
#include <CGAL/Polynomial/internal/Simple_interval_root.h>
CGAL_POLYNOMIAL_BEGIN_NAMESPACE
namespace CGAL { namespace POLYNOMIAL {
template <class Poly>
class Upper_bound_root_stack_Descartes_traits: public internal::Root_stack_traits_base<Poly>
@ -49,5 +49,5 @@ public:
}
};
CGAL_POLYNOMIAL_END_NAMESPACE
} } //namespace CGAL::POLYNOMIAL
#endif

4
Kinetic_data_structures/hidden/include/CGAL/Polynomial/Upper_bound_root_stack_filtered_Descartes_traits.h
View File

@ -28,7 +28,7 @@
#include <CGAL/Polynomial/internal/Simple_interval_root.h>
#include <CGAL/Polynomial/internal/Isolating_interval.h>
CGAL_POLYNOMIAL_BEGIN_NAMESPACE
namespace CGAL { namespace POLYNOMIAL {
template <class Traits>
class Upper_bound_root_stack_filtered_Descartes_traits: public internal::Filtered_rational_traits<Traits>
@ -54,5 +54,5 @@ class Upper_bound_root_stack_filtered_Descartes_traits: public internal::Filtere
}
};
CGAL_POLYNOMIAL_END_NAMESPACE
} } //namespace CGAL::POLYNOMIAL
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Active_objects_vector.h
View File

@ -35,7 +35,7 @@
#include <CGAL/iterator.h>
#include <boost/iterator/transform_iterator.hpp>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
//! Holds a set of moving points and creates notifications when changes occur.
/*! This container holds a set of objects of a particular type. It
@ -359,5 +359,5 @@ inline std::istream &operator>>(std::istream &in, Active_objects_vector<V> &v) {
return v.read(in);
}
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/CORE_Expr_exact_simulation_traits.h
View File

@ -33,7 +33,7 @@
#include <CGAL/Cartesian.h>
//#include <CGAL/Regular_triangulation_euclidean_traits_3.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
struct CORE_Expr_exact_simulation_traits {
typedef CORE_Expr_exact_simulation_traits This;
@ -90,5 +90,5 @@ protected:
Kinetic_kernel kk_;
Function_kernel fk_;
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Cartesian.h
View File

@ -23,7 +23,7 @@
#include <CGAL/Kinetic/basic.h>
#include <CGAL/Kinetic/internal/Kernel/Cartesian_kinetic_kernel_base.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
//! A kinetic kernel using cartesian coordinates
/*! It takes a PolynomialKernel as a template parameter. The
@ -43,7 +43,7 @@ public:
Cartesian(){}
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
//#include <CGAL/Kinetic_internals/kernel_undefs.h>
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Certificate_generator.h
View File

@ -22,7 +22,7 @@
#define CGAL_KINETIC_IO_KERNEL_CERTIFICATE_GENERATOR_H
#include <CGAL/Kinetic/basic.h>
//#include <CGAL/Kinetic/internal/Kernel/Certificate.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
template <class KK_t, class Generator>
struct Certificate_generator {
typedef typename KK_t::Certificate result_type;
@ -139,6 +139,6 @@ protected:
typename KK_t::Function_kernel fk_;
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Default_instantaneous_kernel.h
View File

@ -41,7 +41,7 @@
#define CGAL_TSO(name) typedef typename Static_kernel::name name
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
template <class CIK>
class Default_instantaneous_kernel_rep: public Ref_counted<Default_instantaneous_kernel_rep<CIK> >
@ -384,5 +384,5 @@ protected:
};
#undef CGAL_MSA
#undef CGAL_TSO
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Default_simulator.h
View File

@ -27,7 +27,7 @@
#include <CGAL/Kinetic/Ref_counted.h>
#include <CGAL/Kinetic/Multi_listener.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
#ifdef CGAL_KINETIC_CHECK_EXPENSIVE
#ifndef CGAL_KINETIC_DISABLE_AUDITING
@ -733,5 +733,5 @@ void Default_simulator<S, PQ>::audit_all_kdss()
CGAL_OUTPUT2(Default_simulator)
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_2.h
View File

@ -34,7 +34,7 @@
#include <CGAL/Kinetic/Event_base.h>
#include <CGAL/Kinetic/Delaunay_triangulation_default_traits_2.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
//#ifdef NDEBUG
#define CGAL_DELAUNAY_2_DEBUG(x)
/*#else
@ -1174,5 +1174,5 @@ void Delaunay_triangulation_2<Sim, Del, W, T>::audit() const
}
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

8
Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_3.h
View File

@ -45,7 +45,7 @@
# pragma warning(disable:4355) // complaint about using 'this' to
#endif // initialize a member
CGAL_KINETIC_BEGIN_INTERNAL_NAMESPACE
namespace CGAL { namespace Kinetic { namespace internal {
template <class Traits>
struct Delaunay_triangulation_3_types
@ -64,9 +64,9 @@ struct Delaunay_triangulation_3_types
};
CGAL_KINETIC_END_INTERNAL_NAMESPACE
} } } //namespace CGAL::Kinetic::internal
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
//! A 3D kinetic Delaunay triangulation.
template <class TraitsT,
@ -214,7 +214,7 @@ public:
KDel kdel_;
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#if defined(BOOST_MSVC)
# pragma warning(pop)

4
Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_cell_base_3.h
View File

@ -25,7 +25,7 @@
#include <CGAL/Triangulation_cell_base_3.h>
#include <CGAL/Triangulation_cell_base_with_info_3.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
//! A class to track labels of edges of faces in a triangulation
template <class SimulationTraits, class Cell_base= CGAL::Triangulation_cell_base_3<typename SimulationTraits::Instantaneous_kernel> >
class Delaunay_triangulation_cell_base_3: public Cell_base
@ -113,5 +113,5 @@ std::ostream &operator<<(std::ostream &out,
}
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_default_traits_2.h
View File

@ -23,7 +23,7 @@
#include <CGAL/Kinetic/basic.h>
#include <CGAL/Kinetic/internal/tds_2_helpers.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
template <class Simulation_traits_t, class Triangulation_t>
class Delaunay_triangulation_default_traits_2 {
@ -152,6 +152,6 @@ protected:
O2 o2_;
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_event_log_visitor_2.h
View File

@ -25,7 +25,7 @@
#include <sstream>
#include <CGAL/Kinetic/Delaunay_triangulation_visitor_base_2.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
struct Delaunay_triangulation_event_log_visitor_2: public Delaunay_triangulation_visitor_base_2
{
@ -71,5 +71,5 @@ struct Delaunay_triangulation_event_log_visitor_2: public Delaunay_triangulation
std::vector<std::string> log_;
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_event_log_visitor_3.h
View File

@ -29,7 +29,7 @@
#include <sstream>
#include <algorithm>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
struct Delaunay_triangulation_event_log_visitor_3: public Delaunay_triangulation_visitor_base_3
{
@ -120,5 +120,5 @@ struct Delaunay_triangulation_event_log_visitor_3: public Delaunay_triangulation
std::vector<std::string> log_;
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_face_base_2.h
View File

@ -24,7 +24,7 @@
#include <CGAL/Kinetic/basic.h>
#include <CGAL/Triangulation_face_base_2.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
//! A class to track labels of edges of faces in a triangulation
template <class SimulationTraits, class Face_base= CGAL::Triangulation_face_base_2<typename SimulationTraits::Instantaneous_kernel> >
class Delaunay_triangulation_face_base_2: public Face_base
@ -102,5 +102,5 @@ std::ostream &operator<<(std::ostream &out,
}
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_recent_edges_visitor_2.h
View File

@ -24,7 +24,7 @@
#include <CGAL/Kinetic/Delaunay_triangulation_visitor_base_2.h>
#include <set>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
template <class Triangulation>
struct Delaunay_triangulation_recent_edges_visitor_2: public Delaunay_triangulation_visitor_base_2
@ -76,5 +76,5 @@ struct Delaunay_triangulation_recent_edges_visitor_2: public Delaunay_triangulat
std::set<Edge> recent_;
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_vertex_base_2.h
View File

@ -24,7 +24,7 @@
#include <CGAL/Kinetic/basic.h>
#include <CGAL/Triangulation_vertex_base_2.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
template < typename GT,
typename Vb = Triangulation_vertex_base_2<GT> >
@ -65,6 +65,6 @@ public:
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

4
Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_visitor_base_2.h
View File

@ -22,7 +22,7 @@
#define CGAL_KINETIC_DELAUNAY_TRIANGULATION_2_WATCHER_BASE_H
#include <CGAL/Kinetic/basic.h>
CGAL_KINETIC_BEGIN_NAMESPACE
namespace CGAL { namespace Kinetic {
struct Delaunay_triangulation_visitor_base_2
{
@ -77,5 +77,5 @@ struct Delaunay_triangulation_visitor_base_2
}
};
CGAL_KINETIC_END_NAMESPACE
} } //namespace CGAL::Kinetic
#endif

Some files were not shown because too many files have changed in this diff Show More