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

Macros MUST be prefixed with CGAL_ 

-pedantic does not like extra semicolons

todo:  cleanup: The macro is there twice.
This commit is contained in:
Andreas Fabri 2014-07-09 15:41:08 +02:00
parent 3aefde776a
commit b1f4afbd33
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
STL_Extension/include/CGAL/Compact_container.h
View File

@ -83,7 +83,7 @@
namespace CGAL {
#define GENERATE_MEMBER_DETECTOR(X) \
#define CGAL_GENERATE_MEMBER_DETECTOR(X) \
template<typename T> class has_##X { \
struct Fallback { int X; }; \
struct Derived : T, Fallback { }; \
@ -99,7 +99,7 @@ template<typename T> class has_##X { \
public: \
typedef has_##X type; \
enum { value = sizeof(func<Derived>(0)) == 2 }; \
};
} // semicolon is after the macro call
#define CGAL_INIT_COMPACT_CONTAINER_BLOCK_SIZE 14
#define CGAL_INCREMENT_COMPACT_CONTAINER_BLOCK_SIZE 16
@ -181,7 +181,7 @@ namespace internal {
template < class DSC, bool Const >
class CC_iterator;
GENERATE_MEMBER_DETECTOR(increment_erase_counter);
CGAL_GENERATE_MEMBER_DETECTOR(increment_erase_counter);
// A basic "no erase counter" strategy
template <bool Has_erase_counter_tag>

6
STL_Extension/include/CGAL/Concurrent_compact_container.h
View File

@ -40,7 +40,7 @@
namespace CGAL {
#define GENERATE_MEMBER_DETECTOR(X) \
#define CGAL_GENERATE_MEMBER_DETECTOR(X) \
template<typename T> class has_##X { \
struct Fallback { int X; }; \
struct Derived : T, Fallback { }; \
@ -56,7 +56,7 @@ template<typename T> class has_##X { \
public: \
typedef has_##X type; \
enum { value = sizeof(func<Derived>(0)) == 2 }; \
};
} // semicolon is after the macro call
#define CGAL_INIT_CONCURRENT_COMPACT_CONTAINER_BLOCK_SIZE 14
#define CGAL_INCREMENT_CONCURRENT_COMPACT_CONTAINER_BLOCK_SIZE 16
@ -73,7 +73,7 @@ namespace CCC_internal {
template < class CCC, bool Const >
class CCC_iterator;
GENERATE_MEMBER_DETECTOR(increment_erase_counter);
CGAL_GENERATE_MEMBER_DETECTOR(increment_erase_counter);
// A basic "no erase counter" strategy
template <bool Has_erase_counter_tag>