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
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
|
Index: boost/boost/config/compiler/gcc.hpp
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/boost/config/compiler/gcc.hpp,v
retrieving revision 1.1.4.1
diff -u -p -b -r1.1.4.1 gcc.hpp
--- boost/boost/config/compiler/gcc.hpp 27 May 2003 12:45:50 -0000 1.1.4.1
+++ boost/boost/config/compiler/gcc.hpp 22 Apr 2004 17:03:24 -0000
@@ -50,7 +50,7 @@
#endif
//
// last known and checked version is 3.2:
-#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3))
+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 4))
# if defined(BOOST_ASSERT_CONFIG)
# error "Unknown compiler version - please run the configure tests and report the results"
# else
Index: boost/boost/format/format_implementation.hpp
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/boost/format/format_implementation.hpp,v
retrieving revision 1.2
diff -u -p -b -r1.2 format_implementation.hpp
--- boost/boost/format/format_implementation.hpp 21 Nov 2002 18:33:01 -0000 1.2
+++ boost/boost/format/format_implementation.hpp 22 Apr 2004 17:03:25 -0000
@@ -151,7 +151,7 @@ basic_format<Ch,Tr>& basic_format<Ch,Tr>
{
if(argN<1 || argN > num_args_ || bound_.size()==0 || !bound_[argN-1] )
{
- if( exceptions() & out_of_range_bit )
+ if( exceptions() & io::out_of_range_bit )
boost::throw_exception(io::out_of_range()); // arg not in range.
else return *this;
}
Index: src/BoostFormat.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Attic/BoostFormat.h,v
retrieving revision 1.4
diff -u -p -b -r1.4 BoostFormat.h
--- src/BoostFormat.h 25 Nov 2002 19:44:44 -0000 1.4
+++ src/BoostFormat.h 22 Apr 2004 17:03:25 -0000
@@ -15,7 +15,7 @@ namespace boost
{
extern
-template basic_format<char>;
+template class basic_format<char>;
extern template
std::ostream &
Index: src/buffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.399.2.7
diff -u -p -b -r1.399.2.7 buffer.C
Index: src/frontends/controllers/ControlDialog.tmpl
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/Attic/ControlDialog.tmpl,v
retrieving revision 1.9.2.1
diff -u -p -b -r1.9.2.1 ControlDialog.tmpl
--- src/frontends/controllers/ControlDialog.tmpl 19 Mar 2003 13:20:48 -0000 1.9.2.1
+++ src/frontends/controllers/ControlDialog.tmpl 22 Apr 2004 17:03:26 -0000
@@ -27,54 +27,54 @@ ControlDialog<Base>::ControlDialog(LyXVi
template <class Base>
void ControlDialog<Base>::show()
{
- if (isBufferDependent() && !bufferIsAvailable())
+ if (this->isBufferDependent() && !this->bufferIsAvailable())
return;
- connect();
+ this->connect();
if (!dialog_built_) {
- view().build();
+ this->view().build();
dialog_built_ = true;
}
setParams();
- if (emergency_exit_) {
+ if (this->emergency_exit_) {
hide();
return;
}
- bc().readOnly(bufferIsReadonly());
- view().show();
+ this->bc().readOnly(this->bufferIsReadonly());
+ this->view().show();
// The widgets may not be valid, so refresh the button controller
- bc().refresh();
+ this->bc().refresh();
}
template <class Base>
void ControlDialog<Base>::update()
{
- if (isBufferDependent() && !bufferIsAvailable())
+ if (this->isBufferDependent() && !this->bufferIsAvailable())
return;
setParams();
- if (emergency_exit_) {
+ if (this->emergency_exit_) {
hide();
return;
}
- bc().readOnly(bufferIsReadonly());
- view().update();
+ this->bc().readOnly(this->bufferIsReadonly());
+ this->view().update();
// The widgets may not be valid, so refresh the button controller
- bc().refresh();
+ this->bc().refresh();
}
template <class Base>
void ControlDialog<Base>::hide()
{
- emergency_exit_ = false;
+ this->emergency_exit_ = false;
clearParams();
- disconnect();
- view().hide();
+ this->disconnect();
+ this->view().hide();
}
Index: src/frontends/qt2/FileDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/FileDialog.C,v
retrieving revision 1.15.2.1
diff -u -p -b -r1.15.2.1 FileDialog.C
Index: src/frontends/qt2/Qt2Base.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Attic/Qt2Base.h,v
retrieving revision 1.20
diff -u -p -b -r1.20 Qt2Base.h
--- src/frontends/qt2/Qt2Base.h 2 Feb 2003 00:48:38 -0000 1.20
+++ src/frontends/qt2/Qt2Base.h 22 Apr 2004 17:03:26 -0000
@@ -174,14 +174,14 @@ Qt2CB<Controller, Base>::Qt2CB(QString c
template <class Controller, class Base>
Controller & Qt2CB<Controller, Base>::controller()
{
- return static_cast<Controller &>(getController());
+ return static_cast<Controller &>(this->getController());
}
template <class Controller, class Base>
Controller const & Qt2CB<Controller, Base>::controller() const
{
- return static_cast<Controller const &>(getController());
+ return static_cast<Controller const &>(this->getController());
}
Index: src/frontends/xforms/FormBase.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/Attic/FormBase.h,v
retrieving revision 1.54
diff -u -p -b -r1.54 FormBase.h
--- src/frontends/xforms/FormBase.h 2 Feb 2003 00:48:38 -0000 1.54
+++ src/frontends/xforms/FormBase.h 22 Apr 2004 17:03:27 -0000
@@ -188,14 +188,14 @@ FormCB<Controller, Base>::FormCB(string
template <class Controller, class Base>
Controller & FormCB<Controller, Base>::controller()
{
- return static_cast<Controller &>(getController());
+ return static_cast<Controller &>(this->getController());
}
template <class Controller, class Base>
Controller const & FormCB<Controller, Base>::controller() const
{
- return static_cast<Controller const &>(getController());
+ return static_cast<Controller const &>(this->getController());
}
--- boost/boost/format/feed_args.hpp 2004/05/15 00:41:57 1.1
+++ boost/boost/format/feed_args.hpp 2004/05/15 00:58:24
@@ -34,7 +34,7 @@ namespace {
template<class Tr, class Ch> inline
void empty_buf(BOOST_IO_STD basic_ostringstream<Ch,Tr> & os) {
- static const std::basic_string<Ch, Tr> emptyStr; // avoids 2 cases ( "" and L"" )
+ const std::basic_string<Ch, Tr> emptyStr; // avoids 2 cases ( "" and L"" )
os.str(emptyStr);
}
|
GitWeb