ChangeLogTag:Tue Jan 14 18:51:49 2003 Steve Huston <shuston@riverace.com>

7 files changed, 76 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 0fbacc8eeae..da4f4be6d4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Tue Jan 14 18:51:49 2003  Steve Huston  <shuston@riverace.com>
+
+        * ace/Auto_Ptr.h: Added pragma to disable warning 4284 for Microsoft
+          compilers. The warned-of behavior is exactly what is intended.
+
+        * bin/MakeProjectCreator/templates/em3vcpdll.mpt:
+        * bin/MakeProjectCreator/templates/em3vcpdllexe.mpt:
+        * bin/MakeProjectCreator/templates/em3vcplib.mpt:
+        * bin/MakeProjectCreator/templates/em3vcplibexe.mpt:
+          Added a "WCE emulator" configuration section. This allows builds
+          for the WinCE emulator, necessary for working with the WinCE.NET
+          Standard SDK emulator.
+
 Tue Jan 14 14:56:12 2003  Steve Huston  <shuston@riverace.com>
 
         * ace/config-win32-common.h: For WinCE, don't include wce.h unless
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 0fbacc8eeae..da4f4be6d4f 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,16 @@
+Tue Jan 14 18:51:49 2003  Steve Huston  <shuston@riverace.com>
+
+        * ace/Auto_Ptr.h: Added pragma to disable warning 4284 for Microsoft
+          compilers. The warned-of behavior is exactly what is intended.
+
+        * bin/MakeProjectCreator/templates/em3vcpdll.mpt:
+        * bin/MakeProjectCreator/templates/em3vcpdllexe.mpt:
+        * bin/MakeProjectCreator/templates/em3vcplib.mpt:
+        * bin/MakeProjectCreator/templates/em3vcplibexe.mpt:
+          Added a "WCE emulator" configuration section. This allows builds
+          for the WinCE emulator, necessary for working with the WinCE.NET
+          Standard SDK emulator.
+
 Tue Jan 14 14:56:12 2003  Steve Huston  <shuston@riverace.com>
 
         * ace/config-win32-common.h: For WinCE, don't include wce.h unless
diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h
index 1889ace99be..bc86ef1fd86 100644
--- a/ace/Auto_Ptr.h
+++ b/ace/Auto_Ptr.h
@@ -25,6 +25,15 @@
 
 #include "ace/Trace.h"
 
+#if defined (_MSC_VER)
+// Suppress warning e.g. "return type for
+// 'ACE_Auto_Array_Pointer<type>::operator ->' is 'type *' (i.e., not a UDT
+// or reference to a UDT.  Will produce errors if applied using infix
+// notation)"
+#  pragma warning(push)
+#  pragma warning(disable: 4284)
+#endif /* _MSC_VER */
+
 /**
  * @class ACE_Auto_Basic_Ptr
  *
@@ -170,5 +179,10 @@ public:
 #pragma implementation ("Auto_Ptr.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
+#if defined (_MSC_VER)
+// Restore the warning state to what it was before entry.
+#  pragma warning(pop)
+#endif /* _MSC_VER */
+
 #include "ace/post.h"
 #endif /* ACE_AUTO_PTR_H */
diff --git a/bin/MakeProjectCreator/templates/em3vcpdll.mpt b/bin/MakeProjectCreator/templates/em3vcpdll.mpt
index 7125968e250..f73c4b2940b 100644
--- a/bin/MakeProjectCreator/templates/em3vcpdll.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcpdll.mpt
@@ -1,5 +1,5 @@
 configurations        = Release Debug
-platform_longs        = "WCE ARM" "WCE x86" 
+platform_longs        = "WCE ARM" "WCE x86" "WCE emulator"
 default_configuration = Debug
 default_platform_long = "WCE ARM"
 type_is_binary        = 1
@@ -16,6 +16,14 @@ WCE x86 {
   cpu_defines = _i386_ _X86_ x86
 }
 
+WCE emulator {
+  type_code   = 0xa602
+  cpu_id      = D6518FF3-710F-11D3-99F2-00105A0DF099
+  platform_id = 8A9A2F80-6887-11D3-842E-005004848CBA
+  machine     = IX86
+  cpu_defines = _i386_ _X86_ x86
+}
+
 WCE ARM {
   type_code   = 0x8502
   cpu_id      = D6518FFC-710F-11D3-99F2-00105A0DF099
diff --git a/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt b/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
index 56469e4f471..34a465fa40b 100644
--- a/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcpdllexe.mpt
@@ -1,5 +1,5 @@
 type_description      = "Application"
-platform_longs        = "WCE ARM" "WCE x86" 
+platform_longs        = "WCE ARM" "WCE x86" "WCE emulator"
 default_configuration = Debug
 default_platform_long = "WCE ARM"
 configurations        = Release Debug
@@ -16,6 +16,14 @@ WCE x86 {
   cpu_defines = _i386_ _X86_ x86
 }
 
+WCE emulator {
+  type_code   = 0xa601
+  cpu_id      = D6518FF3-710F-11D3-99F2-00105A0DF099
+  platform_id = 8A9A2F80-6887-11D3-842E-005004848CBA
+  machine     = IX86
+  cpu_defines = _i386_ _X86_ x86
+}
+
 WCE ARM {
   type_code   = 0x8501
   cpu_id      = D6518FFC-710F-11D3-99F2-00105A0DF099
diff --git a/bin/MakeProjectCreator/templates/em3vcplib.mpt b/bin/MakeProjectCreator/templates/em3vcplib.mpt
index f1a61a5b06c..96bd8cfdd88 100644
--- a/bin/MakeProjectCreator/templates/em3vcplib.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcplib.mpt
@@ -1,5 +1,5 @@
 type_description      = "Static Library"
-platform_longs        = "WCE ARM" "WCE x86" 
+platform_longs        = "WCE ARM" "WCE x86" "WCE emulator"
 default_configuration = "Static Debug"
 default_platform_long = "WCE ARM"
 configurations        = "Static Release" "Static Debug"
@@ -16,6 +16,14 @@ WCE x86 {
   cpu_defines = _i386_ _X86_ x86
 }
 
+WCE emulator {
+  type_code   = 0xa604
+  cpu_id      = D6518FF3-710F-11D3-99F2-00105A0DF099
+  platform_id = 8A9A2F80-6887-11D3-842E-005004848CBA
+  machine     = IX86
+  cpu_defines = _i386_ _X86_ x86
+}
+
 WCE ARM {
   type_code   = 0x8504
   cpu_id      = D6518FFC-710F-11D3-99F2-00105A0DF099
diff --git a/bin/MakeProjectCreator/templates/em3vcplibexe.mpt b/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
index 53470714cc8..65febff00b7 100644
--- a/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
+++ b/bin/MakeProjectCreator/templates/em3vcplibexe.mpt
@@ -1,5 +1,5 @@
 type_description      = "Application"
-platform_longs        = "WCE ARM" "WCE x86" 
+platform_longs        = "WCE ARM" "WCE x86" "WCE emulator"
 default_configuration = "Static Debug"
 default_platform_long = "WCE ARM"
 configurations        = "Static Release" "Static Debug"
@@ -16,6 +16,14 @@ WCE x86 {
   cpu_defines = _i386_ _X86_ x86
 }
 
+WCE emulator {
+  type_code   = 0xa601
+  cpu_id      = D6518FF3-710F-11D3-99F2-00105A0DF099
+  platform_id = 8A9A2F80-6887-11D3-842E-005004848CBA
+  machine     = IX86
+  cpu_defines = _i386_ _X86_ x86
+}
+
 WCE ARM {
   type_code   = 0x8501
   cpu_id      = D6518FFC-710F-11D3-99F2-00105A0DF099