Attached is a patch for successful build the tests in "... Dll"
configurations.

   ChangeLog:
   21.string.h (StringState): Added _TEST_EXPORT specification
   rw_char.h (UserCharFmatInit): Ditto
   21.cwchar.cpp: Added #ifndef/#endif guard to avoid double
   function definition
   27.objects.cpp (run_test): Corrected rw_warning() to rw_warn()

Farid.

Index: include/21.strings.h
===================================================================
--- include/21.strings.h        (revision 447848)
+++ include/21.strings.h        (working copy)
@@ -822,7 +822,7 @@
 // encapsulates the state of a string object without regard to type
 // used in exception safety tests to determine changes to the state
 // after a modifying operation throws an exception
-struct StringState
+struct _TEST_EXPORT StringState
 {
     const void*   data_;
     _RWSTD_SIZE_T size_;
Index: include/rw_char.h
===================================================================
--- include/rw_char.h   (revision 447848)
+++ include/rw_char.h   (working copy)
@@ -499,7 +499,7 @@
 }
 
 
-static const struct UserCharFmatInit {
+static const struct _TEST_EXPORT UserCharFmatInit {
     UserCharFmatInit ();
 } _rw_user_char_fmat_init;
 
Index: iostream/27.objects.cpp
===================================================================
--- iostream/27.objects.cpp     (revision 447839)
+++ iostream/27.objects.cpp     (working copy)
@@ -322,7 +322,7 @@
 
 #ifdef _RWSTD_NO_REPLACEABLE_NEW_DELETE
 
-    rw_warning (0, 0, __LINE__,
+    rw_warn (0, 0, __LINE__,
                 "replacement operators new and delete not tested: "
                 "_RWSTD_NO_REPLACEABLE_NEW_DELETE #defined");
 
Index: strings/21.cwchar.cpp
===================================================================
--- strings/21.cwchar.cpp       (revision 447839)
+++ strings/21.cwchar.cpp       (working copy)
@@ -810,7 +810,11 @@
 GET_TYPE_NAME (long);
 GET_TYPE_NAME (unsigned long);
 GET_TYPE_NAME (double);
+
+#ifndef _RWSTD_NO_NATIVE_WCHAR_T
 GET_TYPE_NAME (wchar_t);
+#endif
+
 GET_TYPE_NAME (wchar_t*);
 GET_TYPE_NAME (const wchar_t*);
 

Reply via email to