blob: a12bf9a9b55d0b0d5d8d77a9aaf7a3aff573c8f9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
Fix build issues due to access declarations: https://crbug.com/806958
ISO C++11 does not allow access declarations; use using declarations instead.
The link to "Bug Tracker" on http://openjade.sourceforge.net/bugs.html
is not working. Sent a mail containing bug report to the Openjade-devel@
address on that page.
Patch by Rahul Chaudhry <rahulchaudhry@chromium.org>
--- a/include/IList.h
+++ b/include/IList.h
@@ -26,8 +26,8 @@ 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
--- a/include/IListIter.h
+++ b/include/IListIter.h
@@ -17,8 +17,8 @@ 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
--- a/include/Ptr.h
+++ b/include/Ptr.h
@@ -69,8 +69,8 @@ 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 {
--- a/lib/Parser.h
+++ b/lib/Parser.h
@@ -62,16 +62,16 @@ 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;
- ParserState::instantiateDtd;
+ 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;
+ using ParserState::instantiateDtd;
friend class PiAttspecParser;
private:
Parser(const Parser &); // undefined
|
GitWeb