14 files changed, 1 insertions, 74 deletions
diff --git a/ACE/protocols/ace/INet/BidirStreamBuffer.h b/ACE/protocols/ace/INet/BidirStreamBuffer.h
index 61306083a9d..1b5f0e4a76b 100644
--- a/ACE/protocols/ace/INet/BidirStreamBuffer.h
+++ b/ACE/protocols/ace/INet/BidirStreamBuffer.h
@@ -124,13 +124,7 @@ namespace ACE
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/INet/BidirStreamBuffer.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("BidirStreamBuffer.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_IOS_BIDIR_STREAM_BUFFER_H */
diff --git a/ACE/protocols/ace/INet/BufferedStreamBuffer.h b/ACE/protocols/ace/INet/BufferedStreamBuffer.h
index 4bb2a5c394b..56bae21bb22 100644
--- a/ACE/protocols/ace/INet/BufferedStreamBuffer.h
+++ b/ACE/protocols/ace/INet/BufferedStreamBuffer.h
@@ -95,13 +95,7 @@ namespace ACE
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/INet/BufferedStreamBuffer.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("BufferedStreamBuffer.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_IOS_BUFFERED_STREAM_BUFFER_H */
diff --git a/ACE/protocols/ace/INet/FTP_Session.h b/ACE/protocols/ace/INet/FTP_Session.h
index 787877cee8e..8a218490fde 100644
--- a/ACE/protocols/ace/INet/FTP_Session.h
+++ b/ACE/protocols/ace/INet/FTP_Session.h
@@ -112,13 +112,7 @@ namespace ACE
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/INet/FTP_Session.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("FTP_Session.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_FTP_SESSION_H */
diff --git a/ACE/protocols/ace/INet/HTTPS_Session.h b/ACE/protocols/ace/INet/HTTPS_Session.h
index 51f0132c530..e08d9dd61cd 100644
--- a/ACE/protocols/ace/INet/HTTPS_Session.h
+++ b/ACE/protocols/ace/INet/HTTPS_Session.h
@@ -86,13 +86,7 @@ namespace ACE
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/INet/HTTPS_Session.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("HTTPS_Session.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_HTTPS_SESSION_H */
diff --git a/ACE/protocols/ace/INet/HTTP_Session.h b/ACE/protocols/ace/INet/HTTP_Session.h
index ef45d3006e5..784f6073373 100644
--- a/ACE/protocols/ace/INet/HTTP_Session.h
+++ b/ACE/protocols/ace/INet/HTTP_Session.h
@@ -66,13 +66,7 @@ namespace ACE
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/INet/HTTP_Session.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("HTTP_Session.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_HTTP_SESSION_H */
diff --git a/ACE/protocols/ace/INet/HTTP_StreamPolicy.h b/ACE/protocols/ace/INet/HTTP_StreamPolicy.h
index 73e15241500..ca8c9889b59 100644
--- a/ACE/protocols/ace/INet/HTTP_StreamPolicy.h
+++ b/ACE/protocols/ace/INet/HTTP_StreamPolicy.h
@@ -85,13 +85,7 @@ namespace ACE
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/INet/HTTP_StreamPolicy.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("HTTP_StreamPolicy.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_HTTP_STREAM_POLICY_H */
diff --git a/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h b/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h
index a305492f59a..5f2e1b58097 100644
--- a/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h
+++ b/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h
@@ -52,13 +52,7 @@ namespace ACE
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/INet/HTTP_StreamPolicyBase.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("HTTP_StreamPolicyBase.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_HTTP_STREAM_POLICY_BASE_H */
diff --git a/ACE/protocols/ace/INet/SSLSock_IOStream.h b/ACE/protocols/ace/INet/SSLSock_IOStream.h
index f97887a9e1d..92d71913636 100644
--- a/ACE/protocols/ace/INet/SSLSock_IOStream.h
+++ b/ACE/protocols/ace/INet/SSLSock_IOStream.h
@@ -163,13 +163,7 @@ namespace ACE
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/INet/SSLSock_IOStream.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("SSLSock_IOStream.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_IOS_SSLSOCK_IOSTREAM_H */
diff --git a/ACE/protocols/ace/INet/SSL_CallbackManager.h b/ACE/protocols/ace/INet/SSL_CallbackManager.h
index 2e58acac03e..c2c807809de 100644
--- a/ACE/protocols/ace/INet/SSL_CallbackManager.h
+++ b/ACE/protocols/ace/INet/SSL_CallbackManager.h
@@ -22,7 +22,7 @@ namespace ACE
   {
     namespace INet
       {
-        // NOTE: Solaris studio compilers amongst others will issue warnings if the
+        // NOTE: Some compilers will issue warnings if the
         // the correct type of function pointer (i.e. extern "C" ) is not stored/used
         // of the form:
         //   Warning (Anachronism): Formal argument 1 of type
diff --git a/ACE/protocols/ace/INet/Sock_IOStream.h b/ACE/protocols/ace/INet/Sock_IOStream.h
index ddd101c7453..609be0fcedc 100644
--- a/ACE/protocols/ace/INet/Sock_IOStream.h
+++ b/ACE/protocols/ace/INet/Sock_IOStream.h
@@ -162,13 +162,7 @@ namespace ACE
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/INet/Sock_IOStream.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Sock_IOStream.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_IOS_SOCK_IOSTREAM_H */
diff --git a/ACE/protocols/ace/INet/StreamHandler.h b/ACE/protocols/ace/INet/StreamHandler.h
index 2a680d61450..f2314122f11 100644
--- a/ACE/protocols/ace/INet/StreamHandler.h
+++ b/ACE/protocols/ace/INet/StreamHandler.h
@@ -137,13 +137,7 @@ namespace ACE
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/INet/StreamHandler.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("StreamHandler.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_IOS_STREAM_HANDLER_H */
diff --git a/ACE/protocols/ace/INet/StreamInterceptor.h b/ACE/protocols/ace/INet/StreamInterceptor.h
index e71cda5c94f..1df803c1142 100644
--- a/ACE/protocols/ace/INet/StreamInterceptor.h
+++ b/ACE/protocols/ace/INet/StreamInterceptor.h
@@ -59,13 +59,7 @@ namespace ACE
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/INet/StreamInterceptor.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("StreamInterceptor.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_IOS_STREAM_INTERCEPTOR_H */
diff --git a/ACE/protocols/ace/INet/String_IOStream.h b/ACE/protocols/ace/INet/String_IOStream.h
index 508852317d9..f1be7ffa2da 100644
--- a/ACE/protocols/ace/INet/String_IOStream.h
+++ b/ACE/protocols/ace/INet/String_IOStream.h
@@ -160,13 +160,7 @@ namespace ACE
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/INet/String_IOStream.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("String_IOStream.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_IOS_STRING_IOSTREAM_H */
diff --git a/ACE/protocols/ace/INet/inet.mpc b/ACE/protocols/ace/INet/inet.mpc
index 3d7d8c815ca..e0c77ec0bc7 100644
--- a/ACE/protocols/ace/INet/inet.mpc
+++ b/ACE/protocols/ace/INet/inet.mpc
@@ -3,7 +3,6 @@ project(INet) : acelib, ace_output, install {
   sharedname   = ACE_INet
   dynamicflags += ACE_INET_BUILD_DLL
   includes += $(ACE_ROOT)/protocols
-  avoids += wince
   avoids += old_stdstream
   avoids += exclude_inet
   avoids += ace_for_tao