Attachment #31446 for bug #48760

Lines 50-56 Link Here

(-)boost/boost/config/compiler/gcc.hpp (-1 / +1 lines)
50	#endif	50	#endif
51	//	51	//
52	// last known and checked version is 3.2:	52	// last known and checked version is 3.2:
53	#if (__GNUC__ > 3) \|\| ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3))	53	#if (__GNUC__ > 3) \|\| ((__GNUC__ == 3) && (__GNUC_MINOR__ > 4))
54	# if defined(BOOST_ASSERT_CONFIG)	54	# if defined(BOOST_ASSERT_CONFIG)
55	# error "Unknown compiler version - please run the configure tests and report the results"	55	# error "Unknown compiler version - please run the configure tests and report the results"
56	# else	56	# else

Lines 151-157 basic_format<Ch,Tr>& basic_format<Ch,Tr> Link Here

(-)boost/boost/format/format_implementation.hpp (-1 / +1 lines)
151	{	151	{
152	if(argN<1 \|\| argN > num_args_ \|\| bound_.size()==0 \|\| !bound_[argN-1] )	152	if(argN<1 \|\| argN > num_args_ \|\| bound_.size()==0 \|\| !bound_[argN-1] )
153	{	153	{
154	if( exceptions() & out_of_range_bit )	154	if( exceptions() & io::out_of_range_bit )
155	boost::throw_exception(io::out_of_range()); // arg not in range.	155	boost::throw_exception(io::out_of_range()); // arg not in range.
156	else return *this;	156	else return *this;
157	}	157	}

Lines 15-21 namespace boost Link Here

(-)src/BoostFormat.h (-1 / +1 lines)
15	{	15	{
16		16
17	extern	17	extern
18	template basic_format<char>;	18	template class basic_format<char>;
19		19
20	extern template	20	extern template
21	std::ostream &	21	std::ostream &




template <class Base>
void ControlDialog<Base>::show()
{
	if (this->isBufferDependent() && !this->bufferIsAvailable())
		return;

	this->connect();

	if (!dialog_built_) {
		this->view().build();
		dialog_built_ = true;
	}

	setParams();
	if (this->emergency_exit_) {
		hide();
		return;
	}

	this->bc().readOnly(this->bufferIsReadonly());
	this->view().show();

	// The widgets may not be valid, so refresh the button controller
	this->bc().refresh();
}

template <class Base>
void ControlDialog<Base>::update()
{
	if (this->isBufferDependent() && !this->bufferIsAvailable())
		return;

	setParams();
	if (this->emergency_exit_) {
		hide();
		return;
	}

	this->bc().readOnly(this->bufferIsReadonly());
	this->view().update();

	// The widgets may not be valid, so refresh the button controller
	this->bc().refresh();
}

template <class Base>
void ControlDialog<Base>::hide()
{
	this->emergency_exit_ = false;
	clearParams();

	this->disconnect();
	this->view().hide();
}




template <class Controller, class Base>
Controller & Qt2CB<Controller, Base>::controller()
{
	return static_cast<Controller &>(this->getController());
}


template <class Controller, class Base>
Controller const & Qt2CB<Controller, Base>::controller() const
{
	return static_cast<Controller const &>(this->getController());
}






template <class Controller, class Base>
Controller & FormCB<Controller, Base>::controller()
{
	return static_cast<Controller &>(this->getController());
}


template <class Controller, class Base>
Controller const & FormCB<Controller, Base>::controller() const
{
	return static_cast<Controller const &>(this->getController());
}



Lines 34-40 namespace { Link Here

(-)boost/boost/format/feed_args.hpp (-1 / +1 lines)
34		34
35	template<class Tr, class Ch> inline	35	template<class Tr, class Ch> inline
36	void empty_buf(BOOST_IO_STD basic_ostringstream<Ch,Tr> & os) {	36	void empty_buf(BOOST_IO_STD basic_ostringstream<Ch,Tr> & os) {
37	static const std::basic_string<Ch, Tr> emptyStr; // avoids 2 cases ( "" and L"" )	37	const std::basic_string<Ch, Tr> emptyStr; // avoids 2 cases ( "" and L"" )
38	os.str(emptyStr);	38	os.str(emptyStr);
39	}	39	}
40		40

Return to bug 48760

Lines 174-187 Qt2CB<Controller, Base>::Qt2CB(QString c Link Here

(-)src/frontends/qt2/Qt2Base.h (-2 / +2 lines)
174	template <class Controller, class Base>	174	template <class Controller, class Base>
175	Controller & Qt2CB<Controller, Base>::controller()	175	Controller & Qt2CB<Controller, Base>::controller()
176	{	176	{
177	return static_cast<Controller &>(getController());	177	return static_cast<Controller &>(this->getController());
178	}	178	}
179		179
180		180
181	template <class Controller, class Base>	181	template <class Controller, class Base>
182	Controller const & Qt2CB<Controller, Base>::controller() const	182	Controller const & Qt2CB<Controller, Base>::controller() const
183	{	183	{
184	return static_cast<Controller const &>(getController());	184	return static_cast<Controller const &>(this->getController());
185	}	185	}
186		186
187		187

Lines 188-201 FormCB<Controller, Base>::FormCB(string Link Here

(-)src/frontends/xforms/FormBase.h (-2 / +2 lines)
188	template <class Controller, class Base>	188	template <class Controller, class Base>
189	Controller & FormCB<Controller, Base>::controller()	189	Controller & FormCB<Controller, Base>::controller()
190	{	190	{
191	return static_cast<Controller &>(getController());	191	return static_cast<Controller &>(this->getController());
192	}	192	}
193		193
194		194
195	template <class Controller, class Base>	195	template <class Controller, class Base>
196	Controller const & FormCB<Controller, Base>::controller() const	196	Controller const & FormCB<Controller, Base>::controller() const
197	{	197	{
198	return static_cast<Controller const &>(getController());	198	return static_cast<Controller const &>(this->getController());
199	}	199	}
200		200
201		201

Lines 27-80 ControlDialog<Base>::ControlDialog(LyXVi Link Here

(-)src/frontends/controllers/ControlDialog.tmpl (-15 / +15 lines)
27	template <class Base>	27	template <class Base>
28	void ControlDialog<Base>::show()	28	void ControlDialog<Base>::show()
29	{	29	{
30	if (isBufferDependent() && !bufferIsAvailable())	30	if (this->isBufferDependent() && !this->bufferIsAvailable())
31	return;	31	return;
32		32
33	connect();	33	this->connect();
34		34
35	if (!dialog_built_) {	35	if (!dialog_built_) {
36	view().build();	36	this->view().build();
37	dialog_built_ = true;	37	dialog_built_ = true;
38	}	38	}
39		39
40	setParams();	40	setParams();
41	if (emergency_exit_) {	41	if (this->emergency_exit_) {
42	hide();	42	hide();
43	return;	43	return;
44	}	44	}
45		45
46	bc().readOnly(bufferIsReadonly());	46	this->bc().readOnly(this->bufferIsReadonly());
47	view().show();	47	this->view().show();
48		48
49	// The widgets may not be valid, so refresh the button controller	49	// The widgets may not be valid, so refresh the button controller
50	bc().refresh();	50	this->bc().refresh();
51	}	51	}
52		52
53	template <class Base>	53	template <class Base>
54	void ControlDialog<Base>::update()	54	void ControlDialog<Base>::update()
55	{	55	{
56	if (isBufferDependent() && !bufferIsAvailable())	56	if (this->isBufferDependent() && !this->bufferIsAvailable())
57	return;	57	return;
58		58
59	setParams();	59	setParams();
60	if (emergency_exit_) {	60	if (this->emergency_exit_) {
61	hide();	61	hide();
62	return;	62	return;
63	}	63	}
64		64
65	bc().readOnly(bufferIsReadonly());	65	this->bc().readOnly(this->bufferIsReadonly());
66	view().update();	66	this->view().update();
67		67
68	// The widgets may not be valid, so refresh the button controller	68	// The widgets may not be valid, so refresh the button controller
69	bc().refresh();	69	this->bc().refresh();
70	}	70	}
71		71
72	template <class Base>	72	template <class Base>
73	void ControlDialog<Base>::hide()	73	void ControlDialog<Base>::hide()
74	{	74	{
75	emergency_exit_ = false;	75	this->emergency_exit_ = false;
76	clearParams();	76	clearParams();
77		77
78	disconnect();	78	this->disconnect();
79	view().hide();	79	this->view().hide();
80	}	80	}