Commit Graph

229 Commits

Author SHA1 Message Date
Sébastien Loriot a1fdcd6170 explicitly check that the Interval template parameter is an interval.
MSVC is not able to eliminate the function even when the functor used
is Null_functor that has no result_type.
2012-01-20 13:08:32 +00:00
Sébastien Loriot 45e7c06392 revert r67297.
Fix test it in candidates
2012-01-19 10:08:57 +00:00
Sébastien Loriot f17ccbb823 explicitly check that the Interval template parameter is an interval.
MSVC is not able to eliminate the function even when the functor used
is Null_functor that has no result_type.
2012-01-19 08:49:20 +00:00
Andreas Fabri cebb7314bc Fix for Windows 'min/max' bug 2012-01-18 11:05:35 +00:00
Laurent Rineau 5b5dd33848 merge changes from next 2012-01-09 12:33:39 +00:00
Sébastien Loriot 5fd945cd3c is_iterator now requests the type to be either a pointer or
to provide all 5 nested types provided by iterator_traits
2011-11-23 11:29:15 +00:00
Marc Glisse dc3b382bd4 Simplify the code and help with thread-safety by reading the return value of operator--. 2011-10-29 07:18:10 +00:00
Laurent Rineau 1efe6ff9c4 merge from next, again 2011-10-13 10:25:40 +00:00
Laurent Rineau b41acfcc5e Revert those two commits:
| ------------------------------------------------------------------------
  | r65838 | afabri | 2011-10-12 13:01:14 +0200 (Wed, 12 Oct 2011) | 5 lines
  | Changed paths:
  |    M /branches/next/STL_Extension/include/CGAL/assertions.h
  | 
  | When CGAL_NO_ASSERTIONS, fix CGAL_static_assertion 
  | 
  | CGAL_static_assertion cannot be "static_cast<void>(0)" because that
  | macro can also be used in a class or namespace scope.
  | 
  | ------------------------------------------------------------------------
  | r65833 | lrineau | 2011-10-11 23:43:39 +0200 (Tue, 11 Oct 2011) | 6 lines
  | Changed paths:
  |    M /branches/next/STL_Extension/include/CGAL/assertions.h
  | 
  | Avoid a warning with -ansi -pedantic when CGAL_NO_ASSERTIONS
  | 
  | When CGAL_NO_ASSERTIONS is defined (when NDEBUG is defined, for example), 
  | "CGAL_static_assertion(true);" must not be expanded to ";", to avoid a
  | pedantic warning "extra ;".
  | 
  | ------------------------------------------------------------------------

That was just a very wrong way to fix a pedantic warning: the new
implementations were buggy.
2011-10-13 10:24:14 +00:00
Marc Glisse 4fff839d84 Revert, was supposed to go to candidates... 2011-10-12 15:00:55 +00:00
Marc Glisse 03ff622be8 Help with a future thread-safe version (and make the code shorter). 2011-10-12 14:41:53 +00:00
Laurent Rineau 5946c69608 merge from next 2011-10-12 13:52:06 +00:00
Andreas Fabri eba24795fa When CGAL_NO_ASSERTIONS, fix CGAL_static_assertion
CGAL_static_assertion cannot be "static_cast<void>(0)" because that
macro can also be used in a class or namespace scope.
2011-10-12 11:01:14 +00:00
Laurent Rineau 44be6552ef Avoid a warning with -ansi -pedantic when CGAL_NO_ASSERTIONS
When CGAL_NO_ASSERTIONS is defined (when NDEBUG is defined, for example), 
"CGAL_static_assertion(true);" must not be expanded to ";", to avoid a
pedantic warning "extra ;".
2011-10-11 21:43:39 +00:00
Sébastien Loriot 91a5327fa8 change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Andreas Fabri cbfe32ce37 Add declspecs for Visual C++ so that we can build dlls 2011-10-05 19:12:23 +00:00
Sébastien Loriot 62a6daf1da add to Compact_container iterator type operators > >= and <= 2011-10-04 11:25:45 +00:00
Laurent Rineau fdd69b61a3 Rename macro of Compact_container to avoid potential future conflict
Add the _COMPACT_CONTAINER_ infix:
  CGAL_INIT_BLOCK_SIZE -> CGAL_INIT_COMPACT_CONTAINER_BLOCK_SIZE
  CGAL_INCREMENT_BLOCK_SIZE -> CGAL_INCREMENT_COMPACT_CONTAINER_BLOCK_SIZE
2011-09-29 14:21:10 +00:00
Guillaume Damiand 71d1d6f56a Add reserve method in compact container (include file, plus ref manual, plus test). 2011-09-27 12:01:42 +00:00
Sébastien Loriot dff6dda8b3 Remove from copyright holder
Freie Universitaet Berlin (Germany), Martin-Luther-University Halle-Wittenberg
(Germany) and RISC Linz (Austria) as they transfer the copyright to other
sites.
2011-09-21 19:46:31 +00:00
Sébastien Loriot 7ec484eac7 merge next into feature branch 2011-09-09 06:44:09 +00:00
Guillaume Damiand a29c905ee0 Replace BOOST_STATIC_ASSERT by CGAL_static_assertion. 2011-08-31 14:30:07 +00:00
Philipp Möller f9b288db90 Merged branch ^/branches/features/gsoc2011-copy_n-pmoeller.
Small feature page: https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Replace_copy_n
2011-08-26 14:34:10 +00:00
Laurent Rineau 1e3c229440 merge from next 2011-08-26 13:55:12 +00:00
Marc Glisse ab56912a06 s/static_assert/CGAL_static_assertion_msg/ 2011-08-08 16:48:34 +00:00
Andreas Fabri 01f978de36 partial undo: remove debug output 2011-06-30 22:11:47 +00:00
Andreas Fabri 7dbddbc945 Add CR in the last line to quiet Intel C++ 2011-06-30 22:09:49 +00:00
Laurent Rineau 4cf99c4a3d Fix mutable_queue.hpp with old Boost versions
boost/property_map.hpp has moved in recent Boost versions.
2011-06-21 10:22:47 +00:00
Sébastien Loriot f488e75869 BUGFIX: change internal boost namespace to boost_ to avoid ambiguities
of boost:: in internal namespace (vs ::boost::)
2011-06-17 13:22:42 +00:00
Sébastien Loriot b80fd74b73 BUGFIX: this is safer to compare to the size of indices 2011-06-17 13:07:06 +00:00
Sébastien Loriot acb0950398 BUGFIX (together with 64192,64193,64194):
Modifiable_priority_queue no longer depends on non-documented
boost code. This code has been copied into CGAL.

Modify boost's mutable_queue to have a constructor initializing
indices of elements not in the queue to the maximum number of elements.
Update pop to maintain this property
2011-06-17 13:04:58 +00:00
Sébastien Loriot 2254e9b4f8 reverse modifications of Modifiable_priority_queue.h should not be modified in 64193 2011-06-17 12:48:11 +00:00
Sébastien Loriot cacb699937 put boost file inside namespace CGAL::internal::boost
add URL and ID tags
update #ifndef macros
2011-06-17 12:45:16 +00:00
Sébastien Loriot 6838175967 plain copy of files from the release 1.46.1 (BOOST_VERSION 104601)
from undocumented stuff for internal use in CGAL (Mofiable_priority_queue.h).
Modifications of these files to come in another commit
2011-06-17 12:38:15 +00:00
Sébastien Loriot 65d6249062 missing include 2011-06-17 08:46:36 +00:00
Guillaume Damiand d2d010909f merge with next 2011-06-09 13:51:23 +00:00
Philipp Möller fb85f14247 Added the imports to namespace cpp0x. 2011-06-07 12:04:59 +00:00
Philipp Möller 3144673c5b Deprecated successor and predecessor 2011-06-07 10:44:21 +00:00
Marc Glisse dd2aba7fe6 The goal was to be able to use iterator_traits safely, so we don't want arrays... 2011-05-30 15:27:09 +00:00
Sébastien Loriot 1ad7bac55b change license from QPL to LGPL 2011-05-24 13:03:39 +00:00
Marc Glisse d64e8a9371 Fix misinterpretation of decay 2011-05-13 18:37:13 +00:00
Guillaume Damiand c283ac6689 Backport of modifs made in Linear_cell_complex-gdamiand branch. 2011-05-10 07:14:42 +00:00
Guillaume Damiand 046cc5a048 merge from next and from candidates/Combinatorial_map 2011-05-05 12:29:06 +00:00
Sébastien Loriot 0a1b070ed1 temporary fix for visual 2011-04-29 14:32:31 +00:00
Sébastien Loriot 5921eca974 A null functor should not defined a result_type
nor a second_argument_type (this allows using SFINAE
on some functions).
2011-04-13 08:26:09 +00:00
Sébastien Loriot b30c983e3c bugfix: the derivation must be public 2011-03-17 10:16:30 +00:00
Marc Glisse 879c4eb81c Enable implicit Lazy_exact_nt conversions only if there exists an implicit
conversion between the exact types.

I'll add something similar for explicit conversions if required.
2011-03-08 10:27:31 +00:00
Sébastien Loriot d19e13d863 move Modifiable_priority_queue in STL_Extension as it is used by Mesh_3 2011-02-15 16:24:09 +00:00
Guillaume Damiand 261ad9eaf3 Add the 4 operators < <= > >= to compare iterators.
Now we can compare two handles (as for example Halfedge_haldle) which is usefull for example to define directly a std::set<Halfedge_handle> (or a std::map) without need to define a comparator class.

NOTE: this modification was preapproved by the released manager.
2011-02-15 12:50:21 +00:00
Marc Glisse f01ec07125 New is_iterator test for immediate use in PCA. 2011-01-18 10:50:05 +00:00