summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/kernel/stream.hpp
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2010-11-14 09:27:28 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2010-11-14 09:27:28 +0000
commit2c7009b5200ff5b7462b56239c909daef8ed7910 (patch)
tree40b116d31a3c7f56540d12ed05a5b80f3e7c4ef3 /sca-cpp/trunk/kernel/stream.hpp
parentefccdd821b68280ee3b73c8ef5cda121bc27f620 (diff)
Port to Ubuntu server 10.10 64-bit. C++ code fixes required to compile and run on 64-bit. Update INSTALL doc and build scripts. Remove a few obsolete scripts.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1034963 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/kernel/stream.hpp')
-rw-r--r--sca-cpp/trunk/kernel/stream.hpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/sca-cpp/trunk/kernel/stream.hpp b/sca-cpp/trunk/kernel/stream.hpp
index f9d5cc3afe..53fb5e9ff7 100644
--- a/sca-cpp/trunk/kernel/stream.hpp
+++ b/sca-cpp/trunk/kernel/stream.hpp
@@ -106,7 +106,7 @@ ostream& operator<<(ostream& os, unused const stream_endl e) {
*/
class istream {
public:
- virtual const int read(void* buf, int size) = 0;
+ virtual const size_t read(void* buf, size_t size) = 0;
virtual const bool eof() = 0;
virtual const bool fail() = 0;
virtual const int get() = 0;
@@ -116,7 +116,7 @@ public:
/**
* Read from an input stream.
*/
-const int read(istream& is, void * buf, int size) {
+const size_t read(istream& is, void * buf, size_t size) {
return is.read(buf, size);
}
@@ -164,10 +164,11 @@ public:
odebugstream& vprintf(const char* fmt, ...) {
va_list args;
- va_start (args, fmt);
string s;
+ va_start (args, fmt);
s.len = vsnprintf(NULL, 0, fmt, args);
s.buf = gc_cnew(s.len + 1);
+ va_start (args, fmt);
vsnprintf(s.buf, s.len + 1, fmt, args);
buf = buf + s;
va_end (args);