diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-01-12 16:54:37 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-01-12 16:54:37 +0000 |
| commit | d944e35af84a59c9dc88f7027b04c9528cc1bf9b (patch) | |
| tree | 449420f406a63fc0df73fcfd4201e35f98678407 /src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h | |
| parent | 178f37684b9f3bebf95534568b5ef54c15e11c63 (diff) | |
| parent | 9aa92aa2b504d9530125a6a164f76c11f45d8bb5 (diff) | |
Backmerge of last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@959 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: a5c6ef0ae2ee1e18fff88b98131ff4d14a252152
Diffstat (limited to 'src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h')
| -rw-r--r-- | src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h index c1ff8bf2..8942d92c 100644 --- a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h +++ b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h @@ -57,7 +57,7 @@ class Simplex_tree_siblings { /* Default constructor.*/ Simplex_tree_siblings() - : oncles_(NULL), + : oncles_(nullptr), parent_(-1), members_() { } |