Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix1478 #1481

Merged
merged 4 commits into from
Apr 22, 2020
+49 −16
Merged

Fix1478 #1481

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b74c336
Try friend to all cubical complex operators instead of specialization…
JacquesOlivierLachaud Apr 19, 2020
92dafe2
Merge branch 'master' of github.com:DGtal-team/DGtal into Fix1478
JacquesOlivierLachaud Apr 21, 2020
9bf3c87
Update ChangeLog
JacquesOlivierLachaud Apr 21, 2020
a685648
Update ChangeLog.md
kerautret Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@
[#1325](https://github.com/DGtal-team/DGtal/pull/1426))

- *DEC*
- Fix issue (https://github.com/DGtal-team/DGtal/issues/1441))
- Fix issue (https://github.com/DGtal-team/DGtal/issues/1441)
related to bad link in DEC/moduleAT documentation and missing
associated example exampleSurfaceATnormals.cpp (Jacques-Olivier
Lachaud,[#1442](https://github.com/DGtal-team/DGtal/pull/1442))
Lachaud,[#1442](https://github.com/DGtal-team/DGtal/pull/1442)
- Adding missing LGPL headers in the DEC examples (David Coeurjolly
[#1472]((https://github.com/DGtal-team/DGtal/pull/1472))

Expand All @@ -137,6 +137,11 @@
(Roland Denis [#1455](https://github.com/DGtal-team/DGtal/pull/1455))

- *Build*

- Fix issue (https://github.com/DGtal-team/DGtal/issues/1441),
kerautret marked this conversation as resolved.
Show resolved Hide resolved
that is a Visual Studio 2019 build error related to befriend
template specializations
(Jacques-Olivier Lachaud [#1481](https://github.com/DGtal-team/DGtal/pull/1481))
- Removing the homemade CPP11 checks, using cmake macro instead
(David Coeurjolly, [#1446](https://github.com/DGtal-team/DGtal/pull/1446))
- Removes the check for CPP11 when building WITH_ITK
Expand Down
56 changes: 42 additions & 14 deletions src/DGtal/topology/CubicalComplex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,20 +187,48 @@ namespace DGtal
// BOOST_CONCEPT_ASSERT(( boost::PairAssociativeContainer< TCellContainer > ));
BOOST_CONCEPT_ASSERT(( concepts::CSTLAssociativeContainer< TCellContainer > ));

friend Self& DGtal::operator|=<>( Self&, const Self& );
friend Self& DGtal::operator&=<>( Self&, const Self& );
friend Self& DGtal::operator^=<>( Self&, const Self& );
friend Self& DGtal::operator-=<>( Self&, const Self& );
friend Self DGtal::operator| <>( const Self&, const Self& );
friend Self DGtal::operator& <>( const Self&, const Self& );
friend Self DGtal::operator^ <>( const Self&, const Self& );
friend Self DGtal::operator- <>( const Self&, const Self& );
friend Self DGtal::operator~ <>( const Self& );
friend Self DGtal::operator* <>( const Self& );
friend bool DGtal::operator==<>( const Self&, const Self& );
friend bool DGtal::operator!=<>( const Self&, const Self& );
friend bool DGtal::operator<=<>( const Self&, const Self& );
friend bool DGtal::operator>=<>( const Self&, const Self& );
template < typename K, typename C >
friend CubicalComplex<K,C>&
DGtal::operator|=( CubicalComplex<K,C>&, const CubicalComplex<K,C>& );
template < typename K, typename C >
friend CubicalComplex<K,C>&
DGtal::operator&=( CubicalComplex<K,C>&, const CubicalComplex<K,C>& );
template < typename K, typename C >
friend CubicalComplex<K,C>&
DGtal::operator^=( CubicalComplex<K,C>&, const CubicalComplex<K,C>& );
template < typename K, typename C >
friend CubicalComplex<K,C>&
DGtal::operator-=( CubicalComplex<K,C>&, const CubicalComplex<K,C>& );
template < typename K, typename C >
friend CubicalComplex<K,C>
DGtal::operator| ( const CubicalComplex<K,C>&, const CubicalComplex<K,C>& );
template < typename K, typename C >
friend CubicalComplex<K,C>
DGtal::operator& ( const CubicalComplex<K,C>&, const CubicalComplex<K,C>& );
template < typename K, typename C >
friend CubicalComplex<K,C>
DGtal::operator^ ( const CubicalComplex<K,C>&, const CubicalComplex<K,C>& );
template < typename K, typename C >
friend CubicalComplex<K,C>
DGtal::operator- ( const CubicalComplex<K,C>&, const CubicalComplex<K,C>& );
template < typename K, typename C >
friend CubicalComplex<K,C>
DGtal::operator~ ( const CubicalComplex<K,C>& );
template < typename K, typename C >
friend CubicalComplex<K,C>
DGtal::operator* ( const CubicalComplex<K,C>& );
template < typename K, typename C >
friend bool
DGtal::operator==( const CubicalComplex<K,C>&, const CubicalComplex<K,C>& );
template < typename K, typename C >
friend bool
DGtal::operator!=( const CubicalComplex<K,C>&, const CubicalComplex<K,C>& );
template < typename K, typename C >
friend bool
DGtal::operator<=( const CubicalComplex<K,C>&, const CubicalComplex<K,C>& );
template < typename K, typename C >
friend bool
DGtal::operator>=( const CubicalComplex<K,C>&, const CubicalComplex<K,C>& );

typedef TKSpace KSpace; ///< Type of the cellular grid space.
typedef TCellContainer CellContainer; ///< Type for storing cells, an associative container Cell -> Data
Expand Down