author | Michael Krelin <hacker@klever.net> | 2009-09-13 11:40:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2009-09-13 11:45:19 (UTC) |
commit | cf7ef50cedc69f19e4077931fc58ef3ea44a3c87 (patch) (side-by-side diff) | |
tree | 4f4624753175a06fc7abb9a46349e6d7ab0db339 | |
parent | c5e2a9ce7d7836adaa284dee30b70e04081b0d01 (diff) | |
download | libopkele-cf7ef50cedc69f19e4077931fc58ef3ea44a3c87.zip libopkele-cf7ef50cedc69f19e4077931fc58ef3ea44a3c87.tar.gz libopkele-cf7ef50cedc69f19e4077931fc58ef3ea44a3c87.tar.bz2 |
made compiler a bit happierpublic/next
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | include/opkele/expat.h | 2 | ||||
-rw-r--r-- | include/opkele/tidy.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/opkele/expat.h b/include/opkele/expat.h index 21be003..c154785 100644 --- a/include/opkele/expat.h +++ b/include/opkele/expat.h @@ -1,45 +1,45 @@ #ifndef __OPKELE_EXPAT_H #define __OPKELE_EXPAT_H #include <cassert> #include <expat.h> namespace opkele { namespace util { class expat_t { public: XML_Parser _x; expat_t() : _x(0) { } expat_t(XML_Parser x) : _x(x) { } virtual ~expat_t() throw(); expat_t& operator=(XML_Parser x); - operator const XML_Parser(void) const { return _x; } + operator XML_Parser(void) const { return _x; } operator XML_Parser(void) { return _x; } inline bool parse(const char *s,int len,bool final=false) { assert(_x); return XML_Parse(_x,s,len,final); } virtual int unknown_encoding(const XML_Char * /* n */,XML_Encoding * /* i */) { return XML_STATUS_ERROR; } void set_unknown_encoding_handler(); virtual void start_element(const XML_Char * /* n */,const XML_Char ** /* a */) { } virtual void end_element(const XML_Char * /* n */) { } void set_element_handler(); virtual void character_data(const XML_Char * /* s */,int /* l */) { } void set_character_data_handler(); virtual void processing_instruction(const XML_Char * /* t */,const XML_Char * /* d */) { } void set_processing_instruction_handler(); virtual void comment(const XML_Char * /* d */) { } void set_comment_handler(); virtual void start_cdata_section() { } diff --git a/include/opkele/tidy.h b/include/opkele/tidy.h index 059656d..039d13a 100644 --- a/include/opkele/tidy.h +++ b/include/opkele/tidy.h @@ -29,49 +29,49 @@ namespace opkele { inline operator const char*(void) const { return (const char*)_x.bp; } inline operator char*(void) { return (char*)_x.bp; } inline const char *c_str() const { return (const char*)_x.bp; } inline size_t size() const { return _x.size; } }; class tidy_doc_t { public: TidyDoc _x; tidy_doc_t() : _x(0) { } tidy_doc_t(TidyDoc x) : _x(x) { } virtual ~tidy_doc_t() throw() { if(_x) tidyRelease(_x); } tidy_doc_t& operator=(TidyDoc x) { if(_x) tidyRelease(_x); _x = x; return *this; } - operator const TidyDoc(void) const { return _x; } + operator TidyDoc(void) const { return _x; } operator TidyDoc(void) { return _x; } inline bool opt_set(TidyOptionId o,bool v) { assert(_x); return tidyOptSetBool(_x,o,v?yes:no); } inline bool opt_set(TidyOptionId o,int v) { assert(_x); return tidyOptSetInt(_x,o,v); } inline int parse_string(const string& s) { assert(_x); return tidyParseString(_x,s.c_str()); } inline int clean_and_repair() { assert(_x); return tidyCleanAndRepair(_x); } inline int save_buffer(TidyBuffer& ob) { assert(_x); return tidySaveBuffer(_x,&ob); } static inline TidyDoc create() { return tidyCreate(); } }; } |