Changeset 382 for cpp/common/virtfile/stringfile.h

Timestamp:

05/22/15 04:15:14 (9 years ago)

Author:

sz

Message:

Moving frams/virtfile to common/virtfile:

• file references updated (includes, makefile)
• common/virtfile can no longer use the Framsticks specific SString (using std::string instead)

File:

• cpp/common/virtfile/stringfile.h (modified) (2 diffs)

cpp/common/virtfile/stringfile.h

@@ -7 +7 @@
 
 #include "virtfile.h"
-#include <frams/util/sstring.h>
+#include <common/nonstd_stl.h>
+#include <string.h>
 
 class StringFILE : public VirtFILE
 {
 protected:
-        SString& str;
-        long pos;
+        string& str;
+        int pos;
 public:
-        StringFILE(SString& s): VirtFILE(""), str(s), pos(0) {}
+        StringFILE(string& s): VirtFILE(""), str(s), pos(0) {}
         size_t Vread(void *ptr, size_t size, size_t nmemb);
         size_t Vwrite(const void *ptr, size_t size, size_t nmemb) { str.append((const char*)ptr, (int)(size*nmemb)); return size*nmemb; }
-        int Veof() { return pos >= str.len(); }
+        int Veof() { return pos >= int(str.size()); }
         int Vputc(int c) { str += (char)c; return c; }
         int Vputs(const char *s) { str.append(s, (int)strlen(s)); return 0; }
@@ -31 +32 @@
 class StringFILE2 : public StringFILE
 {
-        SString string;
+        string str;
 public:
-        StringFILE2(const SString& s) :StringFILE(string), string(s) {}
-        StringFILE2() :StringFILE(string) {}
-        const SString& getString() { return string; }
+        StringFILE2(const string& s) :StringFILE(str), str(s) {}
+        StringFILE2() :StringFILE(str) {}
+        const string& getString() { return str; }
 };