Author: sebor
Date: Wed Nov 29 16:03:17 2006
New Revision: 480782
URL: http://svn.apache.org/viewvc?view=rev&rev=480782
Log:
2006-11-29 Martin Sebor <[EMAIL PROTECTED]>
* cwchar.cpp (wprintf, wscanf, swprintf): Gave the last formal
argument prior to the ellipsis a name in order to silence SGI
MIPSpro warning: the last argument of the varargs function is
unnamed.
(swscanf, vfwprintf): Removed an undeducible template parameter.
Modified:
incubator/stdcxx/trunk/tests/strings/21.cwchar.cpp
Modified: incubator/stdcxx/trunk/tests/strings/21.cwchar.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/strings/21.cwchar.cpp?view=diff&rev=480782&r1=480781&r2=480782
==============================================================================
--- incubator/stdcxx/trunk/tests/strings/21.cwchar.cpp (original)
+++ incubator/stdcxx/trunk/tests/strings/21.cwchar.cpp Wed Nov 29 16:03:17 2006
@@ -631,16 +631,16 @@
int fwscanf (FileT*, const WCharT*, ...) { return ncalls++; }
template <class WCharT>
-int wprintf (const WCharT*, ...) { return ncalls++; }
+int wprintf (const WCharT* dummy, ...) { return ncalls++; }
template <class WCharT>
-int wscanf (const WCharT*, ...) { return ncalls++; }
+int wscanf (const WCharT* dummy, ...) { return ncalls++; }
template <class WCharT, class SizeT>
-int swprintf (WCharT*, SizeT, const WCharT*, ...) { return ncalls++; }
+int swprintf (WCharT*, SizeT, const WCharT* dummy, ...) { return ncalls++; }
template <class WCharT>
-int swscanf (const WCharT*, const WCharT*, ...) { return ncalls++; }
+int swscanf (const WCharT*, const WCharT* dummy, ...) { return ncalls++; }
template <class FileT, class WCharT, class VAList>
int vfwprintf (FileT*, const WCharT*, VAList) { return ncalls++; }
@@ -918,7 +918,7 @@
// const commented to prevent MSVC 7.0 error:
// error C2147: 'tm_buf' : const automatic array must be fully initialized
- /*const */int tm_buf [16] = { 0 };
+ /* const */ int tm_buf [16] = { 0 };
const test_tm* tmb = (const test_tm*)&tm_buf;
TEST (test_size_t, wcsftime, (wstr, size, L"", tmb), WCSFTIME, -1);
