diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 11:06:52 +0100 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 11:06:52 +0100 |
commit | cd47fa8e718f6ede07aead032d524022bd68b608 (patch) | |
tree | 5c451ce83cff35c8962f2a06da5f950eb91ce1dc /src/common/include/gudhi/Clock.h | |
parent | 6225d21fa6fd87edf10731df87cd3a7099049358 (diff) | |
parent | 49f9e5cc6bf933705500ad96d674df6a9df7f713 (diff) |
Merge master and resolve conflicts
Diffstat (limited to 'src/common/include/gudhi/Clock.h')
-rw-r--r-- | src/common/include/gudhi/Clock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/include/gudhi/Clock.h b/src/common/include/gudhi/Clock.h index 00ab2f27..6966aaaa 100644 --- a/src/common/include/gudhi/Clock.h +++ b/src/common/include/gudhi/Clock.h @@ -41,9 +41,9 @@ class Clock { return msg; } - // Print current value to std::cout + // Print current value to std::clog void print() const { - std::cout << *this << std::endl; + std::clog << *this << std::endl; } friend std::ostream& operator<<(std::ostream& stream, const Clock& clock) { |