summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog16
-rw-r--r--apps/JAWS2/JAWS/Cache_Manager_T.cpp2
-rw-r--r--examples/APG/Logging/LogManager.h4
-rw-r--r--examples/APG/Logging/Use_Multiple_Sinks.cpp2
-rw-r--r--examples/APG/Logging/Use_Ostream.cpp2
-rw-r--r--examples/C++NPv1/Logging_Client.cpp6
-rw-r--r--examples/C++NPv2/Select_Reactor_Logging_Server.cpp6
-rw-r--r--examples/C++NPv2/Server_Shutdown.cpp6
-rw-r--r--examples/C++NPv2/TP_Reactor_Logging_Server.cpp6
-rw-r--r--examples/Export/test.cpp26
10 files changed, 50 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index d9f263a621f..33763ad9524 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Tue Sep 13 11:52:12 UTC 2005 Martin Corino <mcorino@remedy.nl>
+
+ * apps/JAWS2/JAWS/Cache_Manager_T.cpp:
+ * examples/APG/Logging/LogManager.h:
+ * examples/APG/Logging/Use_Multiple_Sinks.cpp:
+ * examples/APG/Logging/Use_Ostream.cpp:
+ * examples/C++NPv1/Logging_Client.cpp:
+ * examples/C++NPv2/Select_Reactor_Logging_Server.cpp:
+ * examples/C++NPv2/Server_Shutdown.cpp:
+ * examples/C++NPv2/TP_Reactor_Logging_Server.cpp:
+ * examples/Export/test.cpp:
+
+ Fixed for environments defining ACE_USES_OLD_IOSTREAMS
+ (which unfortunately is the case for Windows x64 at the
+ moment due to shortcomings in the Platform SDK).
+
Tue Sep 13 10:30:00 UTC 2005 Simon Massey <sma@prismtech.com>
* bin/tao_orb_tests.lst:
diff --git a/apps/JAWS2/JAWS/Cache_Manager_T.cpp b/apps/JAWS2/JAWS/Cache_Manager_T.cpp
index a5d0d3278dc..a4e54f693d5 100644
--- a/apps/JAWS2/JAWS/Cache_Manager_T.cpp
+++ b/apps/JAWS2/JAWS/Cache_Manager_T.cpp
@@ -394,7 +394,7 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
{
// Don't bother to cache this.
- cerr << "*** " << size << " is too small to cache" << endl;
+ cerr << "*** " << static_cast<unsigned int>(size) << " is too small to cache" << endl;
return -1;
}
diff --git a/examples/APG/Logging/LogManager.h b/examples/APG/Logging/LogManager.h
index 1ab99d2cd14..7ffe5a05743 100644
--- a/examples/APG/Logging/LogManager.h
+++ b/examples/APG/Logging/LogManager.h
@@ -31,7 +31,7 @@ public:
// Exclude 1
private:
- std::ofstream *log_stream_;
+ ofstream *log_stream_;
ACE_OSTREAM_TYPE *output_stream_;
// Exclude 1
};
@@ -71,7 +71,7 @@ void LogManager::redirectToOStream (ACE_OSTREAM_TYPE *output)
void LogManager::redirectToFile (const char *filename)
{
- log_stream_ = new std::ofstream ();
+ log_stream_ = new ofstream ();
log_stream_->open (filename, ios::out | ios::app);
this->redirectToOStream ((ACE_OSTREAM_TYPE *)log_stream_);
}
diff --git a/examples/APG/Logging/Use_Multiple_Sinks.cpp b/examples/APG/Logging/Use_Multiple_Sinks.cpp
index 9adef16bf7a..b2d3daec06c 100644
--- a/examples/APG/Logging/Use_Multiple_Sinks.cpp
+++ b/examples/APG/Logging/Use_Multiple_Sinks.cpp
@@ -13,7 +13,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
ACE_TRACE ("main");
ACE_OSTREAM_TYPE *output =
- (ACE_OSTREAM_TYPE *) new std::ofstream ("ostream.output.test");
+ (ACE_OSTREAM_TYPE *) new ofstream ("ostream.output.test");
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IThis will go to STDERR\n")));
diff --git a/examples/APG/Logging/Use_Ostream.cpp b/examples/APG/Logging/Use_Ostream.cpp
index 996746183c1..7187ef563f1 100644
--- a/examples/APG/Logging/Use_Ostream.cpp
+++ b/examples/APG/Logging/Use_Ostream.cpp
@@ -18,7 +18,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
*/
// Listing 2 code/ch03
ACE_OSTREAM_TYPE *output =
- (ACE_OSTREAM_TYPE *) new std::ofstream ("ostream.output.test");
+ (ACE_OSTREAM_TYPE *) new ofstream ("ostream.output.test");
ACE_LOG_MSG->msg_ostream (output, 1);
ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR);
diff --git a/examples/C++NPv1/Logging_Client.cpp b/examples/C++NPv1/Logging_Client.cpp
index 614b557c551..56434d35699 100644
--- a/examples/C++NPv1/Logging_Client.cpp
+++ b/examples/C++NPv1/Logging_Client.cpp
@@ -17,7 +17,8 @@
#include "ace/streams.h"
#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \
- (ACE_HAS_STANDARD_CPP_LIBRARY == 0))
+ (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \
+ defined (ACE_USES_OLD_IOSTREAMS))
# include <stdio.h>
#else
# include <string>
@@ -115,7 +116,8 @@ int main (int argc, char *argv[])
ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "connect()"), 1);
#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \
- (ACE_HAS_STANDARD_CPP_LIBRARY == 0))
+ (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \
+ defined (ACE_USES_OLD_IOSTREAMS))
for (;;) {
char user_input[ACE_Log_Record::MAXLOGMSGLEN];
if (!gets (user_input))
diff --git a/examples/C++NPv2/Select_Reactor_Logging_Server.cpp b/examples/C++NPv2/Select_Reactor_Logging_Server.cpp
index 13db2c90387..cb25269c48f 100644
--- a/examples/C++NPv2/Select_Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/Select_Reactor_Logging_Server.cpp
@@ -12,7 +12,8 @@
#include "ace/Thread_Manager.h"
#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \
- (ACE_HAS_STANDARD_CPP_LIBRARY == 0))
+ (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \
+ defined (ACE_USES_OLD_IOSTREAMS))
# include <stdio.h>
#else
# include <string>
@@ -61,7 +62,8 @@ static ACE_THR_FUNC_RETURN controller (void *arg) {
ACE_NEW_RETURN (quit_handler, Quit_Handler (reactor), 0);
#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \
- (ACE_HAS_STANDARD_CPP_LIBRARY == 0))
+ (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \
+ defined (ACE_USES_OLD_IOSTREAMS))
for (;;) {
char user_input[80];
fgets (user_input, sizeof (user_input), stdin);
diff --git a/examples/C++NPv2/Server_Shutdown.cpp b/examples/C++NPv2/Server_Shutdown.cpp
index 0618eb31395..f0d6df0cdfd 100644
--- a/examples/C++NPv2/Server_Shutdown.cpp
+++ b/examples/C++NPv2/Server_Shutdown.cpp
@@ -14,7 +14,8 @@
#include "ace/streams.h"
#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \
- (ACE_HAS_STANDARD_CPP_LIBRARY == 0))
+ (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \
+ defined (ACE_USES_OLD_IOSTREAMS))
# include <stdio.h>
#else
# include <string>
@@ -50,7 +51,8 @@ static ACE_THR_FUNC_RETURN controller (void *arg) {
ACE_NEW_RETURN (quit_handler, Quit_Handler (reactor), 0);
#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \
- (ACE_HAS_STANDARD_CPP_LIBRARY == 0))
+ (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \
+ defined (ACE_USES_OLD_IOSTREAMS))
for (;;) {
char user_input[80];
fgets (user_input, sizeof (user_input), stdin);
diff --git a/examples/C++NPv2/TP_Reactor_Logging_Server.cpp b/examples/C++NPv2/TP_Reactor_Logging_Server.cpp
index 3c2d73fdd0e..ea65191b6ff 100644
--- a/examples/C++NPv2/TP_Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/TP_Reactor_Logging_Server.cpp
@@ -13,7 +13,8 @@
#include "ace/Thread_Manager.h"
#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \
- (ACE_HAS_STANDARD_CPP_LIBRARY == 0))
+ (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \
+ defined (ACE_USES_OLD_IOSTREAMS))
# include <stdio.h>
#else
# include <string>
@@ -62,7 +63,8 @@ static ACE_THR_FUNC_RETURN controller (void *arg) {
ACE_NEW_RETURN (quit_handler, Quit_Handler (reactor), 0);
#if defined (ACE_WIN32) && (!defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \
- (ACE_HAS_STANDARD_CPP_LIBRARY == 0))
+ (ACE_HAS_STANDARD_CPP_LIBRARY == 0) || \
+ defined (ACE_USES_OLD_IOSTREAMS))
for (;;) {
char user_input[80];
fgets (user_input, sizeof (user_input), stdin);
diff --git a/examples/Export/test.cpp b/examples/Export/test.cpp
index e447dbec3f5..c04f2998e66 100644
--- a/examples/Export/test.cpp
+++ b/examples/Export/test.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "dll.h"
-#include <iostream>
+#include <ace/streams.h>
int
ACE_TMAIN (int, ACE_TCHAR *[])
@@ -13,51 +13,51 @@ ACE_TMAIN (int, ACE_TCHAR *[])
// How this can fail at runtime (rather it would
// probably give link errors), but just in case...
- std::cout << "Method Test: ";
+ cout << "Method Test: ";
if (my_test_class.method () != RETVAL)
{
- std::cout << "Failed" << std::endl;
+ cout << "Failed" << endl;
++failure_count;
}
else
- std::cout << "Succeeded" << std::endl;
+ cout << "Succeeded" << endl;
// Test out the export of a function. Like above,
// I don't know how this can fail at runtime.
- std::cout << "Function Test: ";
+ cout << "Function Test: ";
if (test_function () != RETVAL)
{
- std::cout << "Failed" << std::endl;
+ cout << "Failed" << endl;
++failure_count;
}
else
- std::cout << "Succeeded" << std::endl;
+ cout << "Succeeded" << endl;
// Also test out the export of data.
- std::cout << "Variable Test: ";
+ cout << "Variable Test: ";
if (test_variable != RETVAL)
{
- std::cout << "Failed" << std::endl;
+ cout << "Failed" << endl;
++failure_count;
}
else
- std::cout << "Succeeded" << std::endl;
+ cout << "Succeeded" << endl;
// Test out the ACE_Singleton export by checking to see
// that we have the same instance pointer as the DLL does.
// This can fail at runtime.
- std::cout << "Singleton Test: ";
+ cout << "Singleton Test: ";
if (TEST_SINGLETON::instance () != get_dll_singleton ())
{
- std::cout << "Failed" << std::endl;
+ cout << "Failed" << endl;
++failure_count;
}
else
- std::cout << "Succeeded" << std::endl;
+ cout << "Succeeded" << endl;
// Return the number of failures
return failure_count;
View Lorry Controller Status