[uClibc-cvs] svn commit: trunk/uClibc++/include

[gkajmowi at uclibc.org]

Author: gkajmowi
Date: 2005-05-12 17:04:20 -0600 (Thu, 12 May 2005)
New Revision: 10318

Log:
Fixed problem with failing to handle end-of-file notification
Removed certain enhancements until I can figure out why they are spewing warnings

Modified:
   trunk/uClibc++/include/fstream
   trunk/uClibc++/include/istream
   trunk/uClibc++/include/string
   trunk/uClibc++/include/vector


Changeset:
Modified: trunk/uClibc++/include/fstream
===================================================================
--- trunk/uClibc++/include/fstream	2005-05-12 22:50:12 UTC (rev 10317)
+++ trunk/uClibc++/include/fstream	2005-05-12 23:04:20 UTC (rev 10318)
@@ -234,6 +234,7 @@
 
 				//Restore file descriptor clase
 				fcntl(fileno(fp), F_SETFL, fcntl_flags);
+
 			}
 
 			if(retval !=offset){ //Slide buffer forward again
@@ -434,8 +435,8 @@
 #ifdef __UCLIBCXX_EXPAND_FSTREAM_CHAR__
 #ifndef __UCLIBCXX_COMPILE_FSTREAM__
 
-	template <> filebuf::basic_filebuf();
-	template <> filebuf::~basic_filebuf();
+//	template <> filebuf::basic_filebuf();
+//	template <> filebuf::~basic_filebuf();
 	template <> filebuf::int_type filebuf::pbackfail(filebuf::int_type c);
 	template <> filebuf * filebuf::open(const char* s, ios_base::openmode mode);
 	template <> filebuf * filebuf::close();
@@ -566,13 +567,13 @@
 #ifdef __UCLIBCXX_EXPAND_FSTREAM_CHAR__
 #ifndef __UCLIBCXX_COMPILE_FSTREAM__
 
-	template <> basic_ofstream<char, char_traits<char> >::basic_ofstream();
-	template <> basic_ofstream<char, char_traits<char> >::basic_ofstream(const char* s, ios_base::openmode mode);
-	template <> basic_ofstream<char, char_traits<char> >::~basic_ofstream();
+//	template <> basic_ofstream<char, char_traits<char> >::basic_ofstream();
+//	template <> basic_ofstream<char, char_traits<char> >::basic_ofstream(const char* s, ios_base::openmode mode);
+//	template <> basic_ofstream<char, char_traits<char> >::~basic_ofstream();
 
-	template <> basic_ifstream<char, char_traits<char> >::basic_ifstream();
-	template <> basic_ifstream<char, char_traits<char> >::basic_ifstream(const char* s, ios_base::openmode mode);
-	template <> basic_ifstream<char, char_traits<char> >::~basic_ifstream();
+//	template <> basic_ifstream<char, char_traits<char> >::basic_ifstream();
+//	template <> basic_ifstream<char, char_traits<char> >::basic_ifstream(const char* s, ios_base::openmode mode);
+//	template <> basic_ifstream<char, char_traits<char> >::~basic_ifstream();
 
 #endif
 #endif

Modified: trunk/uClibc++/include/istream
===================================================================
--- trunk/uClibc++/include/istream	2005-05-12 22:50:12 UTC (rev 10317)
+++ trunk/uClibc++/include/istream	2005-05-12 23:04:20 UTC (rev 10318)
@@ -151,7 +151,7 @@
 			for(i=0;i<n-1;++i){
 				c= sbuffer->sgetc();
 				if(c == traits::eof() ){
-					if(i==0){
+					if( basic_ios<charT,traits>::eof() ){
 						basic_ios<charT,traits>::setstate(ios_base::failbit);
 					}else{
 						basic_ios<charT,traits>::setstate(ios_base::eofbit);

Modified: trunk/uClibc++/include/string
===================================================================
--- trunk/uClibc++/include/string	2005-05-12 22:50:12 UTC (rev 10317)
+++ trunk/uClibc++/include/string	2005-05-12 23:04:20 UTC (rev 10318)
@@ -723,11 +723,11 @@
 #ifdef __UCLIBCXX_EXPAND_STRING_CHAR__
 #ifndef __UCLIBCXX_COMPILE_STRING__
 
-	template <> string::basic_string(const allocator<char> &);
-	template <> string::basic_string(size_type n, char c, const allocator<char> & );
-	template <> string::basic_string(const char* s, const allocator<char>& al);
-	template <> string::basic_string(const basic_string& str, size_type pos, size_type n, const allocator<char>& al);
-	template <> string::~basic_string();
+//	template <> string::basic_string(const allocator<char> &);
+//	template <> string::basic_string(size_type n, char c, const allocator<char> & );
+//	template <> string::basic_string(const char* s, const allocator<char>& al);
+//	template <> string::basic_string(const basic_string& str, size_type pos, size_type n, const allocator<char>& al);
+//	template <> string::~basic_string();
 
 	template <> string::size_type string::find(const string & str, size_type pos) const;
 	template <> string::size_type string::find(const char* s, size_type pos) const;

Modified: trunk/uClibc++/include/vector
===================================================================
--- trunk/uClibc++/include/vector	2005-05-12 22:50:12 UTC (rev 10317)
+++ trunk/uClibc++/include/vector	2005-05-12 23:04:20 UTC (rev 10318)
@@ -416,8 +416,8 @@
 #ifdef __UCLIBCXX_EXPAND_VECTOR_BASIC__
 #ifndef __UCLIBCXX_COMPILE_VECTOR__
 
-	template<> vector<char, allocator<char> >::vector(const allocator<char>& al);
-	template<> vector<char, allocator<char> >::vector(size_type n, const char & value, const allocator<char> & al);
+//	template<> vector<char, allocator<char> >::vector(const allocator<char>& al);
+//	template<> vector<char, allocator<char> >::vector(size_type n, const char & value, const allocator<char> & al);
 
 	template<> vector<char, allocator<char> >::~vector();
 	template<> vector<unsigned char, allocator<unsigned char> >::~vector();