Changeset 127 for pjproject/trunk/pjlib/include/pj++/string.hpp

Timestamp:

Jan 30, 2006 6:40:05 PM (18 years ago)

Author:

bennylp

Message:

Finished implementation of UA layer (to be tested)

File:

• pjproject/trunk/pjlib/include/pj++/string.hpp (modified) (12 diffs)

pjproject/trunk/pjlib/include/pj++/string.hpp

@@ -41 +41 @@
 
     //
-    // Construct the buffer from a char*.
-    //
-    explicit Pj_String(char *str) 
+    // Construct the buffer from a char* (use with care)
+    //
+    Pj_String(char *str) 
     { 
         set(str);
@@ -51 +51 @@
     // Construct from a const char*.
     //
-    Pj_String(Pj_Pool *pool, const char *src)
+    Pj_String(Pj_Pool &pool, const char *src)
     {
         set(pool, src);
@@ -57 +57 @@
 
     //
-    // Construct from pj_str_t*.
-    //
-    explicit Pj_String(pj_str_t *s)
-    {
-        set(s);
+    // Construct from pj_str_t&.
+    //
+    explicit Pj_String(pj_str_t &s)
+    {
+        ptr = s.ptr;
+        slen = s.slen;
+    }
+
+    //
+    // Construct from const pj_str_t& (use with care!).
+    //
+    explicit Pj_String(const pj_str_t &s)
+    {
+        ptr = (char*)s.ptr;
+        slen = s.slen;
     }
 
@@ -67 +77 @@
     // Construct by copying from const pj_str_t*.
     //
-    Pj_String(Pj_Pool *pool, const pj_str_t *s)
+    Pj_String(Pj_Pool &pool, const pj_str_t *s)
     {
         set(pool, s);
@@ -73 +83 @@
 
     //
-    // Construct from another Pj_String
-    //
-    explicit Pj_String(Pj_String &rhs)
-    {
-        set(rhs);
-    }
-
-    //
     // Construct by copying from Pj_String
     //
-    Pj_String(Pj_Pool *pool, const Pj_String &rhs)
+    Pj_String(Pj_Pool &pool, const Pj_String &rhs)
     {
         set(pool, rhs);
@@ -89 +91 @@
 
     //
+    // Construct from another Pj_String, use with care!
+    //
+    explicit Pj_String(const Pj_String &rhs)
+    {
+        ptr = rhs.ptr;
+        slen = rhs.slen;
+    }
+
+    //
     // Construct from a char* and a length.
     //
@@ -105 +116 @@
 
     //
+    // You can cast Pj_String to pj_str_t*
+    //
+    operator pj_str_t*()
+    {
+        return this;
+    }
+
+    //
+    // You can cast const Pj_String to const pj_str_t*
+    //
+    operator const pj_str_t*() const
+    {
+        return this;
+    }
+
+    //
     // Get the length of the string.
     //
@@ -139 +166 @@
     // Initialize by copying from a const char*.
     //
-    void set(Pj_Pool *pool, const char *s)
-    {
-        pj_strdup2(pool->pool_(), this, s);
+    void set(Pj_Pool &pool, const char *s)
+    {
+        pj_strdup2(pool, this, s);
     }
 
@@ -155 +182 @@
     // Initialize by copying from const pj_str_t*.
     //
-    void set(Pj_Pool *pool, const pj_str_t *s)
-    {
-        pj_strdup(pool->pool_(), this, s);
+    void set(Pj_Pool &pool, const pj_str_t *s)
+    {
+        pj_strdup(pool, this, s);
     }
 
@@ -187 +214 @@
     // Initialize by copying from a Pj_String*.
     //
-    void set(Pj_Pool *pool, const Pj_String *s)
-    {
-        pj_strdup(pool->pool_(), this, s);
+    void set(Pj_Pool &pool, const Pj_String *s)
+    {
+        pj_strdup(pool, this, s);
     }
 
@@ -195 +222 @@
     // Initialize by copying from other Pj_String.
     //
-    void set(Pj_Pool *pool, const Pj_String &s)
-    {
-        pj_strdup(pool->pool_(), this, &s);
+    void set(Pj_Pool &pool, const Pj_String &s)
+    {
+        pj_strdup(pool, this, &s);
     }
 
@@ -354 +381 @@
 
     ///
-    // Assign from another Pj_String
-    //
-    Pj_String& operator=(Pj_String &rhs)
-    {
-        set(rhs);
+    // Assign from another Pj_String, use with care!
+    //
+    Pj_String& operator=(const Pj_String &rhs)
+    {
+        ptr = rhs.ptr;
+        slen = rhs.slen;
         return *this;
     }