ChangeLogTag:Sat Jun 10 20:51:56 2000 Darrell Brunsch <brunsch@uci.edu>

5 files changed, 54 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 0091490de84..7ba7a5b6749 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Sat Jun 10 20:51:56 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/config-win32-common.h:
+
+          Changed the "You must link with Multithreaded DLL" error
+          to make it sound less like it is a problem with the ACE
+          project file instead of the application project file.
+
+        * docs/ACE-guidelines.html:
+
+          Updated the section on wchar support in ACE.  
+
 Sat Jun 10 17:33:55 2000  Carlos O'Ryan  <coryan@uci.edu>
 
 	* ace/Configuration.cpp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 0091490de84..7ba7a5b6749 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,15 @@
+Sat Jun 10 20:51:56 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/config-win32-common.h:
+
+          Changed the "You must link with Multithreaded DLL" error
+          to make it sound less like it is a problem with the ACE
+          project file instead of the application project file.
+
+        * docs/ACE-guidelines.html:
+
+          Updated the section on wchar support in ACE.  
+
 Sat Jun 10 17:33:55 2000  Carlos O'Ryan  <coryan@uci.edu>
 
 	* ace/Configuration.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 0091490de84..7ba7a5b6749 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,15 @@
+Sat Jun 10 20:51:56 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/config-win32-common.h:
+
+          Changed the "You must link with Multithreaded DLL" error
+          to make it sound less like it is a problem with the ACE
+          project file instead of the application project file.
+
+        * docs/ACE-guidelines.html:
+
+          Updated the section on wchar support in ACE.  
+
 Sat Jun 10 17:33:55 2000  Carlos O'Ryan  <coryan@uci.edu>
 
 	* ace/Configuration.cpp:
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index 3f0ba34f738..aa926c95d10 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -319,7 +319,7 @@ typedef unsigned __int64 ACE_UINT64;
 // On MSVC, this is changed by selecting the Multithreaded 
 // DLL or Debug Multithreaded DLL in the Project Settings
 // under C++ Code Generation.
-#  error You must link ACE against multi-threaded libraries (check your project settings)
+#  error You must link against multi-threaded libraries when using ACE (check your project settings)
 # endif /* !_MT && !ACE_HAS_WINCE */
 #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 
diff --git a/docs/ACE-guidelines.html b/docs/ACE-guidelines.html
index 0cd68414957..c53fa526f6d 100644
--- a/docs/ACE-guidelines.html
+++ b/docs/ACE-guidelines.html
@@ -711,8 +711,23 @@ Foo::bar ()
 
   <li><strong>WCHAR conformity</strong><p>
 
-  <!-- @@ UNICODE: update -->
-  For now, don't worry about it.
+  <ul>
+     <li>For ACE, use ACE_TCHAR instead of char for strings and ACE_TEXT () 
+         around string literals.  Exceptions are char arrays used for data
+         and strings that need to remain as 1 byte characters.
+
+     <li>If you have a char string that needs to be converted to ACE_TCHAR,
+         use the ACE_TEXT_CHAR_TO_TCHAR () macro.  If you have a ACE_TCHAR
+         string that needs to be converted to a char string, use the
+         ACE_TEXT_ALWAYS_CHAR () macro
+    
+     <li>Do not use the Win32 TCHAR macros.  The wide character-ness of ACE
+         is separate from UNICODE and _UNICODE.
+
+     <li>For TAO, don't use ACE_TCHAR or ACE_TEXT.  The CORBA specification
+         defines APIs as using char.  So most of the time there is no need
+         to use wide characters.
+  </ul>
 
   <li><strong>Exceptions</strong><p>