Fix build with gcc 4.2

Approved by:	miwi (mentor)

3 files changed, 58 insertions, 3 deletions

diff --git a/archivers/rvm/files/patch-estring.h b/archivers/rvm/files/patch-estring.h
new file mode 100644
index 000000000000..78437860dceb
--- /dev/null
+++ b/archivers/rvm/files/patch-estring.h
@@ -0,0 +1,29 @@
+--- ./estring.h.orig	2007-07-14 11:31:16.000000000 +0200
++++ ./estring.h	2007-07-14 11:35:07.000000000 +0200
+@@ -255,21 +255,21 @@
+ 	estring_value m_value;
+ 
+ 	template <class T>
+-	void estring::T_fraction_to_strings(const T& a_t,
++	void T_fraction_to_strings(const T& a_t,
+ 		value_type& a_ws, value_type& a_fs);
+ 
+ 	template <class T>
+-	void estring::T_integral_to_string(const T& a_t, value_type& a_str);
++	void T_integral_to_string(const T& a_t, value_type& a_str);
+ 
+ 	template <class T>
+-	void estring::T_string_to_integral(const value_type& a_str, T& a_t) const;
++	void T_string_to_integral(const value_type& a_str, T& a_t) const;
+ 
+ 	template <class T>
+-	void estring::T_string_to_signed_integral(const value_type& a_str, T& a_t)
++	void T_string_to_signed_integral(const value_type& a_str, T& a_t)
+ 		const;
+ 	
+ 	template <class T>
+-	void estring::T_string_to_fractional(const value_type& a_str, T& a_t) const;
++	void T_string_to_fractional(const value_type& a_str, T& a_t) const;
+ };
+ 
+ #endif
diff --git a/archivers/rvm/files/patch-rconfig.h b/archivers/rvm/files/patch-rconfig.h
index 9a8070dbd1e6..eb2847dd2f6f 100644
--- a/archivers/rvm/files/patch-rconfig.h
+++ b/archivers/rvm/files/patch-rconfig.h
@@ -1,6 +1,6 @@
---- rconfig.h.orig	Sun May  9 07:57:35 2004
-+++ rconfig.h	Sat Aug 21 01:55:46 2004
-@@ -259,7 +259,7 @@
+--- ./rconfig.h.orig	2006-06-23 17:27:50.000000000 +0200
++++ ./rconfig.h	2007-07-14 11:38:49.000000000 +0200
+@@ -266,7 +266,7 @@
  	action_type m_action;
  	bool m_default;
  	class timestamp m_timestamp;
@@ -9,3 +9,12 @@
  	std::string m_link_catalog_dir;
  	std::string m_log_dir;
  	std::string m_rsync_local_path;
+@@ -366,7 +366,7 @@
+ 	bool m_default_context;
+ 
+ 	const std::string location(void);
+-	void job_parser::read_job(const std::string& a_path);
++	void read_job(const std::string& a_path);
+ 
+ 	void parse(void);
+ 	void parse_archive_path(const std::string& a_value);
diff --git a/archivers/rvm/files/patch-table.h b/archivers/rvm/files/patch-table.h
new file mode 100644
index 000000000000..64e34f5ec771
--- /dev/null
+++ b/archivers/rvm/files/patch-table.h
@@ -0,0 +1,17 @@
+--- ./table.h.orig	2007-07-14 11:43:40.000000000 +0200
++++ ./table.h	2007-07-14 11:43:59.000000000 +0200
+@@ -121,10 +121,10 @@
+ 		const table& a_class
+ 		);
+ 
+-	size_type table::col_width(const size_type a_x) const;
+-	size_type table::row_width(void) const;
+-	size_type table::col_height(void) const;
+-	size_type table::row_height(const size_type a_y) const;
++	size_type col_width(const size_type a_x) const;
++	size_type row_width(void) const;
++	size_type col_height(void) const;
++	size_type row_height(const size_type a_y) const;
+ 
+ 	virtual size_type height(void) const;
+ 	virtual size_type width(void) const;