diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-02-10 08:46:54 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-02-10 08:46:54 +0000 |
| commit | 977f22bf235db32be3a88baa8bde24d002714073 (patch) | |
| tree | e5af7c3e8cf46f70d1317eef4523f657c90675c1 /src/2geom | |
| parent | Removing hack for force show red lines in bspline mode (diff) | |
| parent | Fixing format-security errors in text debug code. (diff) | |
| download | inkscape-977f22bf235db32be3a88baa8bde24d002714073.tar.gz inkscape-977f22bf235db32be3a88baa8bde24d002714073.zip | |
update to trunk
(bzr r11950.1.252)
Diffstat (limited to 'src/2geom')
| -rw-r--r-- | src/2geom/generic-interval.h | 4 | ||||
| -rw-r--r-- | src/2geom/generic-rect.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/2geom/generic-interval.h b/src/2geom/generic-interval.h index 87d3be2c1..41eaf59b0 100644 --- a/src/2geom/generic-interval.h +++ b/src/2geom/generic-interval.h @@ -315,14 +315,14 @@ inline GenericOptInterval<C> operator&(GenericInterval<C> const &a, GenericInter return GenericOptInterval<C>(a) & GenericOptInterval<C>(b); } -#ifdef _GLIBCXX_IOSTREAM +//#ifdef _GLIBCXX_IOSTREAM template <typename C> inline std::ostream &operator<< (std::ostream &os, Geom::GenericInterval<C> const &I) { os << "Interval("<<I.min() << ", "<<I.max() << ")"; return os; } -#endif +//#endif } // namespace Geom #endif // !LIB2GEOM_SEEN_GENERIC_INTERVAL_H diff --git a/src/2geom/generic-rect.h b/src/2geom/generic-rect.h index bb6f2d2b8..9ad0e60b0 100644 --- a/src/2geom/generic-rect.h +++ b/src/2geom/generic-rect.h @@ -483,13 +483,13 @@ inline bool GenericRect<C>::contains(OptCRect const &r) const { return !r || contains(*r); } -#ifdef _GLIBCXX_IOSTREAM +//#ifdef _GLIBCXX_IOSTREAM template <typename C> inline std::ostream &operator<<(std::ostream &out, GenericRect<C> const &r) { out << "X: " << r[X] << " Y: " << r[Y]; return out; } -#endif +//#endif } // end namespace Geom |