[uClibc-cvs] CVS uClibc++/include

[CVS User gkajmowi]

Update of /var/cvs/uClibc++/include
In directory nail:/tmp/cvs-serv30713

Modified Files:
	iomanip vector 
Log Message:
Changed iomanip functions to inline to prevent compiler errors.


--- /var/cvs/uClibc++/include/iomanip	2005/01/03 16:28:46	1.1
+++ /var/cvs/uClibc++/include/iomanip	2005/01/03 19:04:39	1.2
@@ -68,27 +68,27 @@
 
 //Actual manipulator functions
 
-__resetiosflags resetiosflags(ios_base::fmtflags mask){
+inline __resetiosflags resetiosflags(ios_base::fmtflags mask){
 	return __resetiosflags(mask);
 }
 
-__setiosflags setiosflags(ios_base::fmtflags mask){
+inline __setiosflags setiosflags(ios_base::fmtflags mask){
 	return __setiosflags(mask);
 }
 
-__setbase setbase(int b){
+inline __setbase setbase(int b){
 	return __setbase(b);
 }
 
-__setfill setfill(int c){
+inline __setfill setfill(int c){
 	return __setfill(c);
 }
 
-__setprecision setprecision(int n){
+inline __setprecision setprecision(int n){
 	return __setprecision(n);
 }
 
-__setw setw(int n){
+inline __setw setw(int n){
 	return __setw(n);
 }
 
@@ -141,7 +141,7 @@
 template<class Ch, class Tr> basic_ostream<Ch, Tr>&
 	operator<<(basic_ostream<Ch, Tr>& os, const __setfill s)
 {
-	os.setfill(s.character);
+	os.fill(s.character);
 	return os;
 }
 
@@ -155,7 +155,7 @@
 template<class Ch, class Tr> basic_ostream<Ch, Tr>&
 	operator<<(basic_ostream<Ch, Tr>& os, const __setw s)
 {
-	os.setw(s.width);
+	os.width(s.width);
 	return os;
 }
 
--- /var/cvs/uClibc++/include/vector	2005/01/03 17:50:22	1.9
+++ /var/cvs/uClibc++/include/vector	2005/01/03 19:04:39	1.10
@@ -275,22 +275,22 @@
 		}
 
 		template <class InputIterator>
-			void _dispatch_insert(iterator position, InputIterator first, InputIterator last, __true_type)
+			inline void _dispatch_insert(iterator position, InputIterator first, InputIterator last, __true_type)
 		{
 			_insert_fill(position, first, last);
 		}
 
 		template <class InputIterator>
-			void _dispatch_insert(iterator position, InputIterator first, InputIterator last, __false_type)
+			inline void _dispatch_insert(iterator position, InputIterator first, InputIterator last, __false_type)
 		{
 				_insert_from_iterator(position, first, last);
 		}
 
-		void insert(iterator position, size_type n, const T& x ){
+		inline void insert(iterator position, size_type n, const T& x ){
 			_insert_fill(position, n, x);
 		}
 
-		template <class InputIterator> void insert(iterator position, InputIterator first, InputIterator last){
+		template <class InputIterator> inline void insert(iterator position, InputIterator first, InputIterator last){
 			typedef typename __is_integer<InputIterator>::value __some_type;
 			_dispatch_insert(position, first, last, __some_type());
 		}