[patch] fix gcc-3.4.1 compile issues

lyx-1.3.4-gcc3.4.patch (text/plain), 6.74 KB, created by blubbfisch on 2004-09-01 20:09:30 UTC

These are the changes I had to do to compile lyx 1.3.x with Gcc 3.4.

I am not done anyting to remove warnings, but only fixed code where
the compile errors out.

I do not think that older gcc's or other compilers should have
problems with any of this. So apply as you see fit.


? Config
? lyx13x_gcc34.diff
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);
   }