summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorpdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-04-14 10:59:50 +0000
committerpdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-04-14 10:59:50 +0000
commita9f33dcd817580ca7f5abc8f04c98a76140c92d0 (patch)
treead6fb40510534c38fd0ffdc7d79aaf22555d52d3 /src
parenta4db38fd615f1734f9f9e471269b26c7d767711b (diff)
Fix to persistence landscapes. Hopefully it will now compile on osx and Marc's computer
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@2352 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: df6c5559ab5edbafc83de84b14c2e771f541b445
Diffstat (limited to 'src')
-rw-r--r--src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape.h b/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape.h
index c274a81f..e14771b3 100644
--- a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape.h
+++ b/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape.h
@@ -48,6 +48,10 @@ namespace Gudhi_stat
+//predeclaration
+class Persistence_landscape;
+template < typename operation >
+Persistence_landscape operation_on_pair_of_landscapes( const Persistence_landscape& land1 , const Persistence_landscape& land2 );
@@ -125,11 +129,11 @@ public:
* Shall those points be joined with lines, we will obtain the i-th landscape function.
**/
friend std::ostream& operator<<(std::ostream& out, Persistence_landscape& land );
+
+ template < typename operation >
+ friend Persistence_landscape operation_on_pair_of_landscapes( const Persistence_landscape& land1 , const Persistence_landscape& land2 );
-protected:
- template < typename oper > friend Persistence_landscape operation_on_pair_of_landscapes ( const Persistence_landscape& land1 , const Persistence_landscape& land2 );
-public:
/**