barant/CoreUtils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Brad Arant 2022-06-29 11:07:21 -07:00
parent 082263f5ea
commit 6697a59c43
2 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IMFMessage.cpp
View File

@ -84,8 +84,4 @@ namespace coreutils {
return ZString(); return ZString();
} }
void IMFMessage::setBody(PString *body) {
this->body = new IMFBody(body);
}
} }

46
ZString.h
View File

@ -1,10 +1,3 @@
<<<<<<< HEAD
#ifndef __ZString_h__
#define __ZString_h__
#include "includes"`
=======
#ifndef __ZString_h__ #ifndef __ZString_h__
#define __ZString_h__ #define __ZString_h__
@ -13,15 +6,10 @@
#include <ostream> #include <ostream>
#include <vector> #include <vector>
#include <stack> #include <stack>
>>>>>>> develop
namespace coreutils { namespace coreutils {
/// ///
<<<<<<< HEAD
/// ZString provides a data pointer and a length to basically point to a string
/// from a common backstore.
=======
/// Use the ZString object when advanced parsing algorithms are required to simplify /// Use the ZString object when advanced parsing algorithms are required to simplify
/// parsing. ZString is not a backing store and requires that any referenced buffer /// parsing. ZString is not a backing store and requires that any referenced buffer
/// or objects are retained throughout the life of the object. Additionally, ZString /// or objects are retained throughout the life of the object. Additionally, ZString
@ -41,44 +29,11 @@ namespace coreutils {
/// ///
/// You can stream the ZString to an output stream using the << operator and the entire /// You can stream the ZString to an output stream using the << operator and the entire
/// contents of the ZString will be output regardless of parsing activity. /// contents of the ZString will be output regardless of parsing activity.
>>>>>>> develop
/// ///
class ZString { class ZString {
public: public:
<<<<<<< HEAD
ZString() {}
ZString(char *data) {
this->data = data;
length = strlen(data);
}
ZString(char *data, size_t length) {
this->data = data;
this->length = length;
}
std::string asString() {
return std::string(data, length);
}
void setString(char *data, size_t length) {
this->data = data;
this->length = length;
}
private:
char *data;
size_t length;
};
}
#endif
=======
/// ///
/// Consructor providing an empty ZString. /// Consructor providing an empty ZString.
@ -349,4 +304,3 @@ namespace coreutils {
} }
#endif #endif
>>>>>>> develop