fix build with clang6

This commit is contained in:
jasper 2018-04-10 13:21:18 +00:00
parent 85ee2fc50a
commit 96e84dec23
4 changed files with 81 additions and 0 deletions

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-include_IListIter_h,v 1.1 2018/04/10 13:21:18 jasper Exp $
Index: include/IListIter.h
--- include/IListIter.h.orig
+++ include/IListIter.h
@@ -17,8 +17,8 @@ class IListIter : private IListIterBase { (public)
IListIter(const IList<T> &list) : IListIterBase(list) { }
T *cur() const { return (T *)IListIterBase::cur(); }
- IListIterBase::next;
- IListIterBase::done;
+ using IListIterBase::next;
+ using IListIterBase::done;
};
#ifdef SP_NAMESPACE

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-include_IList_h,v 1.1 2018/04/10 13:21:18 jasper Exp $
Index: include/IList.h
--- include/IList.h.orig
+++ include/IList.h
@@ -26,8 +26,8 @@ class IList : private IListBase { (public)
void swap(IList<T> &list) { IListBase::swap(list); }
T *head() const { return (T *)IListBase::head(); }
T *get() { return (T *)IListBase::get(); }
- IListBase::clear;
- IListBase::empty;
+ using IListBase::clear;
+ using IListBase::empty;
friend class IListIter<T>;
private:
IList(const IList<T> &); // undefined

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-include_Ptr_h,v 1.1 2018/04/10 13:21:18 jasper Exp $
error: ISO C++11 does not allow access declarations; use using declarations instead
Index: include/Ptr.h
--- include/Ptr.h.orig
+++ include/Ptr.h
@@ -69,8 +69,8 @@ class ConstPtr : private Ptr<T> { (public)
const T *operator->() const { return Ptr<T>::pointer(); }
const T &operator*() const { return *Ptr<T>::pointer(); }
void swap(ConstPtr<T> &p) { Ptr<T>::swap(p); }
- Ptr<T>::isNull;
- Ptr<T>::clear;
+ using Ptr<T>::isNull;
+ using Ptr<T>::clear;
Boolean operator==(const Ptr<T> &p) const { return Ptr<T>::operator==(p); }
Boolean operator!=(const Ptr<T> &p) const { return Ptr<T>::operator!=(p); }
Boolean operator==(const ConstPtr<T> &p) const {

View File

@ -0,0 +1,30 @@
$OpenBSD: patch-lib_Parser_h,v 1.1 2018/04/10 13:21:18 jasper Exp $
Index: lib/Parser.h
--- lib/Parser.h.orig
+++ lib/Parser.h
@@ -62,15 +62,15 @@ class Parser : private ParserState { (public)
Parser(const SgmlParser::Params &);
Event *nextEvent();
void parseAll(EventHandler &, const volatile sig_atomic_t *cancelPtr);
- ParserState::sdPointer;
- ParserState::instanceSyntaxPointer;
- ParserState::prologSyntaxPointer;
- ParserState::activateLinkType;
- ParserState::allLinkTypesActivated;
- ParserState::entityManager;
- ParserState::entityCatalog;
- ParserState::baseDtd;
- ParserState::options;
+ using ParserState::sdPointer;
+ using ParserState::instanceSyntaxPointer;
+ using ParserState::prologSyntaxPointer;
+ using ParserState::activateLinkType;
+ using ParserState::allLinkTypesActivated;
+ using ParserState::entityManager;
+ using ParserState::entityCatalog;
+ using ParserState::baseDtd;
+ using ParserState::options;
private:
Parser(const Parser &); // undefined
void operator=(const Parser &); // undefined