summaryrefslogtreecommitdiffstats
path: root/src/io/stringstream.h
diff options
context:
space:
mode:
authorjtx <javier.arraiza@marker.es>2013-03-04 11:34:32 +0000
committerjtx <javier.arraiza@marker.es>2013-03-04 11:34:32 +0000
commitbac1d241af62679c8d1824c6162965699914c39c (patch)
treec2595c5fa5a11288ec3780e75f943480e19f86e1 /src/io/stringstream.h
parentUpdate from branch (diff)
parentUse ink_cairo_surface_filter when converting surfaces between linearRGB and s... (diff)
downloadinkscape-bac1d241af62679c8d1824c6162965699914c39c.tar.gz
inkscape-bac1d241af62679c8d1824c6162965699914c39c.zip
merge from master branch
(bzr r11950.3.5)
Diffstat (limited to 'src/io/stringstream.h')
-rw-r--r--src/io/stringstream.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/io/stringstream.h b/src/io/stringstream.h
index a78935599..939a87455 100644
--- a/src/io/stringstream.h
+++ b/src/io/stringstream.h
@@ -67,7 +67,7 @@ public:
virtual void flush();
- virtual void put(gunichar ch);
+ virtual int put(gunichar ch);
virtual Glib::ustring &getString()
{ return buffer; }