Return-Path: 
 <commits-return-2398-apmail-stdcxx-commits-archive=stdcxx.apache.org@stdcxx.apache.org>
Delivered-To: apmail-stdcxx-commits-archive@www.apache.org
Received: (qmail 81112 invoked from network); 8 Feb 2008 15:25:15 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 8 Feb 2008 15:25:15 -0000
Received: (qmail 82531 invoked by uid 500); 8 Feb 2008 15:25:07 -0000
Delivered-To: apmail-stdcxx-commits-archive@stdcxx.apache.org
Received: (qmail 82521 invoked by uid 500); 8 Feb 2008 15:25:07 -0000
Mailing-List: contact commits-help@stdcxx.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@stdcxx.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@stdcxx.apache.org>
List-Post: <mailto:commits@stdcxx.apache.org>
List-Id: <commits.stdcxx.apache.org>
Reply-To: dev@stdcxx.apache.org
Delivered-To: mailing list commits@stdcxx.apache.org
Received: (qmail 82512 invoked by uid 99); 8 Feb 2008 15:25:07 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Feb 2008 07:25:07 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Feb 2008 15:24:50 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 59EE71A9832; Fri,  8 Feb 2008 07:24:42 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r619911 - in /stdcxx/trunk/include: istream istream.cc
 string
Date: Fri, 08 Feb 2008 15:24:41 -0000
To: commits@stdcxx.apache.org
From: faridz@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080208152442.59EE71A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: faridz
Date: Fri Feb  8 07:24:40 2008
New Revision: 619911

URL: http://svn.apache.org/viewvc?rev=619911&view=rev
Log:
2008-02-08 Farid Zaripov <farid_zaripov@epam.com>

	STDCXX-375
	* include/istream (std::getline, std::operator>>): Declaration moved from here ...
	* include/string (std::getline, std::operator>>): ... to here.
	* include/istream.cc (std::getline, std::operator>>): Added comment about
	declarations in <string>

Modified:
    stdcxx/trunk/include/istream
    stdcxx/trunk/include/istream.cc
    stdcxx/trunk/include/string

Modified: stdcxx/trunk/include/istream
URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/istream?rev=619911&r1=619910&r2=619911&view=diff
==============================================================================
--- stdcxx/trunk/include/istream (original)
+++ stdcxx/trunk/include/istream Fri Feb  8 07:24:40 2008
@@ -522,21 +522,7 @@
 }
 
 
-_EXPORT
-template<class _CharT, class _Traits, class _Allocator>
-basic_istream<_CharT, _Traits>&
-operator>> (basic_istream<_CharT, _Traits>&,
-            basic_string<_CharT, _Traits, _Allocator>&);
-
-
-_EXPORT
-template<class _CharT, class _Traits, class _Allocator>
-basic_istream<_CharT, _Traits>&
-getline (basic_istream<_CharT, _Traits>&,
-         basic_string<_CharT, _Traits, _Allocator>&,
-         _CharT);
-
-
+// 21.3.7.9 - defined here, declared inline in <string>
 template<class _CharT, class _Traits, class _Allocator>
 inline basic_istream<_CharT, _Traits>& 
 getline (basic_istream<_CharT, _Traits>&            __is,

Modified: stdcxx/trunk/include/istream.cc
URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/istream.cc?rev=619911&r1=619910&r2=619911&view=diff
==============================================================================
--- stdcxx/trunk/include/istream.cc (original)
+++ stdcxx/trunk/include/istream.cc Fri Feb  8 07:24:40 2008
@@ -780,6 +780,7 @@
 }
 
 
+// 21.3.7.9 - defined here, declared in <string>
 _EXPORT
 template<class _CharT, class _Traits, class _Allocator>
 basic_istream<_CharT, _Traits>&
@@ -962,6 +963,7 @@
 }
 
 
+// 21.3.7.9 - defined here, declared in <string>
 _EXPORT
 template<class _CharT, class _Traits, class _Allocator>
 basic_istream<_CharT, _Traits>&

Modified: stdcxx/trunk/include/string
URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/string?rev=619911&r1=619910&r2=619911&view=diff
==============================================================================
--- stdcxx/trunk/include/string (original)
+++ stdcxx/trunk/include/string Fri Feb  8 07:24:40 2008
@@ -1509,6 +1509,30 @@
 }
 
 
+// 21.3.7.9 - declared here, defined in <istream.cc>
+_EXPORT
+template<class _CharT, class _Traits, class _Allocator>
+basic_istream<_CharT, _Traits>&
+operator>> (basic_istream<_CharT, _Traits>&,
+            basic_string<_CharT, _Traits, _Allocator>&);
+
+
+// 21.3.7.9 - declared here, defined in <istream.cc>
+_EXPORT
+template<class _CharT, class _Traits, class _Allocator>
+basic_istream<_CharT, _Traits>&
+getline (basic_istream<_CharT, _Traits>&,
+         basic_string<_CharT, _Traits, _Allocator>&,
+         _CharT);
+
+
+// 21.3.7.9 - declared here, defined inline in <istream>
+template<class _CharT, class _Traits, class _Allocator>
+inline basic_istream<_CharT, _Traits>& 
+getline (basic_istream<_CharT, _Traits>&,
+         basic_string<_CharT, _Traits, _Allocator>&);
+
+
 // 21.3.7.9, p3 - declared here, defined inline in <ostream>
 template<class _CharT, class _Traits, class _Allocator>
 inline basic_ostream<_CharT, _Traits>&