made compiler a bit happierpublic/next

Signed-off-by: Michael Krelin <hacker@klever.net>

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,94 +1,94 @@
 #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() { }
 		virtual void end_cdata_section() { }
 		void set_cdata_section_handler();
 
 		virtual void default_handler(const XML_Char * /* s */,int /* l */) { }
 		void set_default_handler();
 		void set_default_handler_expand();
 
 		virtual void start_namespace_decl(const XML_Char * /* p */,const XML_Char * /* u */) { }
 		virtual void end_namespace_decl(const XML_Char * /* p */) { }
 		void set_namespace_decl_handler();
 
 		inline enum XML_Error get_error_code() {
 		    assert(_x); return XML_GetErrorCode(_x); }
 		static inline const XML_LChar *error_string(XML_Error c) {
 		    return XML_ErrorString(c); }
 
 		inline long get_current_byte_index() {
 		    assert(_x); return XML_GetCurrentByteIndex(_x); }
 		inline int get_current_line_number() {
 		    assert(_x); return XML_GetCurrentLineNumber(_x); }
 		inline int get_current_column_number() {
 		    assert(_x); return XML_GetCurrentColumnNumber(_x); }
 
 		inline void set_user_data() {
 		    assert(_x); XML_SetUserData(_x,this); }
 
 		inline bool set_base(const XML_Char *b) {
 		    assert(_x); return XML_SetBase(_x,b); }
 		inline const XML_Char *get_base() {
 		    assert(_x); return XML_GetBase(_x); }
 
 		inline int get_specified_attribute_count() {
 		    assert(_x); return XML_GetSpecifiedAttributeCount(_x); }
 
 		inline bool set_param_entity_parsing(enum XML_ParamEntityParsing c) {
 		    assert(_x); return XML_SetParamEntityParsing(_x,c); }
 
 		inline static XML_Parser parser_create(const XML_Char *e=0) {
 		    return XML_ParserCreate(e); }
 		inline static XML_Parser parser_create_ns(const XML_Char *e=0,XML_Char s='\t') {
 		    return XML_ParserCreateNS(e,s); }
 
 	};
 
     }
 
 }
 
 #endif /* __OPKELE_EXPAT_H */
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
@@ -1,80 +1,80 @@
 #ifndef __OPKELE_TIDY_H
 #define __OPKELE_TIDY_H
 
 #include <cassert>
 #ifdef HAVE_TIDY_H
 # include <tidy.h>
 # include <buffio.h>
 #elif HAVE_TIDY_TIDY_H
 # include <tidy/tidy.h>
 # include <tidy/buffio.h>
 #else
 # error "Don't know where to look for htmltidy headers"
 #endif
 
 namespace opkele {
     namespace util {
 
 	class tidy_buf_t {
 	    public:
 		TidyBuffer _x;
 
 		tidy_buf_t() { tidyBufInit(&_x); }
 		virtual ~tidy_buf_t() throw() {
 		    tidyBufFree(&_x); }
 
 		inline operator const TidyBuffer&(void) const { return _x; }
 		inline operator TidyBuffer&(void) { return _x; }
 
 		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(); }
 	};
 
     }
 }
 
 #endif /* __OPKELE_TIDY_H */