This commit was manufactured by cvs2svn to create branch

'PROACTOR_FIXES_STEVE_JAN05'.

13 files changed, 402 insertions, 0 deletions

diff --git a/ace/.cvsignore b/ace/.cvsignore
new file mode 100644
index 00000000000..89227cc8b5d
--- /dev/null
+++ b/ace/.cvsignore
@@ -0,0 +1,2 @@
+QtReactor_moc.cpp
+QtReactor_moc.cpp
diff --git a/ace/ACE_FlReactor.pc.in b/ace/ACE_FlReactor.pc.in
new file mode 100644
index 00000000000..c284481585d
--- /dev/null
+++ b/ace/ACE_FlReactor.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ACE_FlReactor
+Description: ACE FlReactor Library
+Requires: ACE
+Version: @VERSION@
+Libs: -L${libdir} -lACE_FlReactor
+Cflags: -I${includedir}
diff --git a/ace/ACE_FlReactor_export.h b/ace/ACE_FlReactor_export.h
new file mode 100644
index 00000000000..ad2cd587f3a
--- /dev/null
+++ b/ace/ACE_FlReactor_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s ACE_FlReactor
+// ------------------------------
+#ifndef ACE_FLREACTOR_EXPORT_H
+#define ACE_FLREACTOR_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_FLREACTOR_HAS_DLL)
+#  define ACE_FLREACTOR_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ACE_FLREACTOR_HAS_DLL */
+
+#if !defined (ACE_FLREACTOR_HAS_DLL)
+#  define ACE_FLREACTOR_HAS_DLL 1
+#endif /* ! ACE_FLREACTOR_HAS_DLL */
+
+#if defined (ACE_FLREACTOR_HAS_DLL) && (ACE_FLREACTOR_HAS_DLL == 1)
+#  if defined (ACE_FLREACTOR_BUILD_DLL)
+#    define ACE_FlReactor_Export ACE_Proper_Export_Flag
+#    define ACE_FLREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define ACE_FLREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* ACE_FLREACTOR_BUILD_DLL */
+#    define ACE_FlReactor_Export ACE_Proper_Import_Flag
+#    define ACE_FLREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define ACE_FLREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* ACE_FLREACTOR_BUILD_DLL */
+#else /* ACE_FLREACTOR_HAS_DLL == 1 */
+#  define ACE_FlReactor_Export
+#  define ACE_FLREACTOR_SINGLETON_DECLARATION(T)
+#  define ACE_FLREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* ACE_FLREACTOR_HAS_DLL == 1 */
+
+// Set ACE_FLREACTOR_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (ACE_FLREACTOR_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define ACE_FLREACTOR_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define ACE_FLREACTOR_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !ACE_FLREACTOR_NTRACE */
+
+#if (ACE_FLREACTOR_NTRACE == 1)
+#  define ACE_FLREACTOR_TRACE(X)
+#else /* (ACE_FLREACTOR_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define ACE_FLREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (ACE_FLREACTOR_NTRACE == 1) */
+
+#endif /* ACE_FLREACTOR_EXPORT_H */
+
+// End of auto generated file.
diff --git a/ace/ACE_QtReactor.pc.in b/ace/ACE_QtReactor.pc.in
new file mode 100644
index 00000000000..4e7aa83e6be
--- /dev/null
+++ b/ace/ACE_QtReactor.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ACE_QtReactor
+Description: ACE QtReactor Library
+Requires: ACE
+Version: @VERSION@
+Libs: -L${libdir} -lACE_QtReactor
+Cflags: -I${includedir}
diff --git a/ace/ACE_QtReactor_export.h b/ace/ACE_QtReactor_export.h
new file mode 100644
index 00000000000..850d2d4dab1
--- /dev/null
+++ b/ace/ACE_QtReactor_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s ACE_QtReactor
+// ------------------------------
+#ifndef ACE_QTREACTOR_EXPORT_H
+#define ACE_QTREACTOR_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_QTREACTOR_HAS_DLL)
+#  define ACE_QTREACTOR_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ACE_QTREACTOR_HAS_DLL */
+
+#if !defined (ACE_QTREACTOR_HAS_DLL)
+#  define ACE_QTREACTOR_HAS_DLL 1
+#endif /* ! ACE_QTREACTOR_HAS_DLL */
+
+#if defined (ACE_QTREACTOR_HAS_DLL) && (ACE_QTREACTOR_HAS_DLL == 1)
+#  if defined (ACE_QTREACTOR_BUILD_DLL)
+#    define ACE_QtReactor_Export ACE_Proper_Export_Flag
+#    define ACE_QTREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define ACE_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* ACE_QTREACTOR_BUILD_DLL */
+#    define ACE_QtReactor_Export ACE_Proper_Import_Flag
+#    define ACE_QTREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define ACE_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* ACE_QTREACTOR_BUILD_DLL */
+#else /* ACE_QTREACTOR_HAS_DLL == 1 */
+#  define ACE_QtReactor_Export
+#  define ACE_QTREACTOR_SINGLETON_DECLARATION(T)
+#  define ACE_QTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* ACE_QTREACTOR_HAS_DLL == 1 */
+
+// Set ACE_QTREACTOR_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (ACE_QTREACTOR_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define ACE_QTREACTOR_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define ACE_QTREACTOR_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !ACE_QTREACTOR_NTRACE */
+
+#if (ACE_QTREACTOR_NTRACE == 1)
+#  define ACE_QTREACTOR_TRACE(X)
+#else /* (ACE_QTREACTOR_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define ACE_QTREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (ACE_QTREACTOR_NTRACE == 1) */
+
+#endif /* ACE_QTREACTOR_EXPORT_H */
+
+// End of auto generated file.
diff --git a/ace/ACE_TkReactor.pc.in b/ace/ACE_TkReactor.pc.in
new file mode 100644
index 00000000000..e53797e600c
--- /dev/null
+++ b/ace/ACE_TkReactor.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ACE_TkReactor
+Description: ACE TkReactor Library
+Requires: ACE
+Version: @VERSION@
+Libs: -L${libdir} -lACE_TkReactor
+Cflags: -I${includedir}
diff --git a/ace/ACE_TkReactor_export.h b/ace/ACE_TkReactor_export.h
new file mode 100644
index 00000000000..096828b9b0e
--- /dev/null
+++ b/ace/ACE_TkReactor_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s ACE_TkReactor
+// ------------------------------
+#ifndef ACE_TKREACTOR_EXPORT_H
+#define ACE_TKREACTOR_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_TKREACTOR_HAS_DLL)
+#  define ACE_TKREACTOR_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ACE_TKREACTOR_HAS_DLL */
+
+#if !defined (ACE_TKREACTOR_HAS_DLL)
+#  define ACE_TKREACTOR_HAS_DLL 1
+#endif /* ! ACE_TKREACTOR_HAS_DLL */
+
+#if defined (ACE_TKREACTOR_HAS_DLL) && (ACE_TKREACTOR_HAS_DLL == 1)
+#  if defined (ACE_TKREACTOR_BUILD_DLL)
+#    define ACE_TkReactor_Export ACE_Proper_Export_Flag
+#    define ACE_TKREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define ACE_TKREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* ACE_TKREACTOR_BUILD_DLL */
+#    define ACE_TkReactor_Export ACE_Proper_Import_Flag
+#    define ACE_TKREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define ACE_TKREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* ACE_TKREACTOR_BUILD_DLL */
+#else /* ACE_TKREACTOR_HAS_DLL == 1 */
+#  define ACE_TkReactor_Export
+#  define ACE_TKREACTOR_SINGLETON_DECLARATION(T)
+#  define ACE_TKREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* ACE_TKREACTOR_HAS_DLL == 1 */
+
+// Set ACE_TKREACTOR_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (ACE_TKREACTOR_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define ACE_TKREACTOR_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define ACE_TKREACTOR_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !ACE_TKREACTOR_NTRACE */
+
+#if (ACE_TKREACTOR_NTRACE == 1)
+#  define ACE_TKREACTOR_TRACE(X)
+#else /* (ACE_TKREACTOR_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define ACE_TKREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (ACE_TKREACTOR_NTRACE == 1) */
+
+#endif /* ACE_TKREACTOR_EXPORT_H */
+
+// End of auto generated file.
diff --git a/ace/ACE_XtReactor.pc.in b/ace/ACE_XtReactor.pc.in
new file mode 100644
index 00000000000..118c61c5632
--- /dev/null
+++ b/ace/ACE_XtReactor.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ACE_XtReactor
+Description: ACE XtReactor Library
+Requires: ACE
+Version: @VERSION@
+Libs: -L${libdir} -lACE_XtReactor
+Cflags: -I${includedir}
diff --git a/ace/ACE_XtReactor_export.h b/ace/ACE_XtReactor_export.h
new file mode 100644
index 00000000000..b7e6a55cd08
--- /dev/null
+++ b/ace/ACE_XtReactor_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s ACE_XtReactor
+// ------------------------------
+#ifndef ACE_XTREACTOR_EXPORT_H
+#define ACE_XTREACTOR_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_XTREACTOR_HAS_DLL)
+#  define ACE_XTREACTOR_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ACE_XTREACTOR_HAS_DLL */
+
+#if !defined (ACE_XTREACTOR_HAS_DLL)
+#  define ACE_XTREACTOR_HAS_DLL 1
+#endif /* ! ACE_XTREACTOR_HAS_DLL */
+
+#if defined (ACE_XTREACTOR_HAS_DLL) && (ACE_XTREACTOR_HAS_DLL == 1)
+#  if defined (ACE_XTREACTOR_BUILD_DLL)
+#    define ACE_XtReactor_Export ACE_Proper_Export_Flag
+#    define ACE_XTREACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define ACE_XTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* ACE_XTREACTOR_BUILD_DLL */
+#    define ACE_XtReactor_Export ACE_Proper_Import_Flag
+#    define ACE_XTREACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define ACE_XTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* ACE_XTREACTOR_BUILD_DLL */
+#else /* ACE_XTREACTOR_HAS_DLL == 1 */
+#  define ACE_XtReactor_Export
+#  define ACE_XTREACTOR_SINGLETON_DECLARATION(T)
+#  define ACE_XTREACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* ACE_XTREACTOR_HAS_DLL == 1 */
+
+// Set ACE_XTREACTOR_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (ACE_XTREACTOR_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define ACE_XTREACTOR_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define ACE_XTREACTOR_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !ACE_XTREACTOR_NTRACE */
+
+#if (ACE_XTREACTOR_NTRACE == 1)
+#  define ACE_XTREACTOR_TRACE(X)
+#else /* (ACE_XTREACTOR_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define ACE_XTREACTOR_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (ACE_XTREACTOR_NTRACE == 1) */
+
+#endif /* ACE_XTREACTOR_EXPORT_H */
+
+// End of auto generated file.
diff --git a/ace/ace_flreactor.mpc b/ace/ace_flreactor.mpc
new file mode 100644
index 00000000000..af3f7afaf9c
--- /dev/null
+++ b/ace/ace_flreactor.mpc
@@ -0,0 +1,30 @@
+//  -*- MPC -*- now wouldn't this be cool...
+// $Id$
+
+project(ACE_FlReactor) : acedefaults, core, acelib, ace_fl{
+
+  sharedname   = ACE_FlReactor
+  dynamicflags = ACE_FLREACTOR_BUILD_DLL
+
+  Source_Files {
+    FlReactor.cpp
+  }
+
+  Header_Files {
+    ACE_FlReactor_export.h
+    FlReactor.h
+  }
+
+  Inline_Files {
+  }
+
+  Template_Files {
+  }
+
+  Resource_Files {
+  }
+
+  Pkgconfig_Files {
+    ACE_FlReactor.pc.in
+  }
+}
diff --git a/ace/ace_qtreactor.mpc b/ace/ace_qtreactor.mpc
new file mode 100644
index 00000000000..549181b1348
--- /dev/null
+++ b/ace/ace_qtreactor.mpc
@@ -0,0 +1,34 @@
+//  -*- MPC -*- now wouldn't this be cool...
+// $Id$
+
+project(ACE_QtReactor) : acedefaults, core, acelib, ace_qt {
+
+  sharedname   = ACE_QtReactor
+  dynamicflags = ACE_QTREACTOR_BUILD_DLL
+
+  MOC_Files {
+    QtReactor.h
+  }
+
+  Source_Files {
+    QtReactor_moc.cpp
+    QtReactor.cpp
+  }
+
+  Header_Files {
+    ACE_QtReactor_export.h
+  }
+
+  Inline_Files {
+  }
+
+  Template_Files {
+  }
+
+  Resource_Files {
+  }
+
+  Pkgconfig_Files {
+    ACE_QtReactor.pc.in
+  }
+}
diff --git a/ace/ace_tkreactor.mpc b/ace/ace_tkreactor.mpc
new file mode 100644
index 00000000000..fbbda18160c
--- /dev/null
+++ b/ace/ace_tkreactor.mpc
@@ -0,0 +1,30 @@
+//  -*- MPC -*- now wouldn't this be cool...
+// $Id$
+
+project(ACE_TkReactor) : acedefaults, core, acelib, ace_tk {
+
+  sharedname   = ACE_TkReactor
+  dynamicflags = ACE_TKREACTOR_BUILD_DLL
+
+  Source_Files {
+    TkReactor.cpp
+  }
+
+  Header_Files {
+    ACE_TkReactor_export.h
+    TkReactor.h
+  }
+
+  Inline_Files {
+  }
+
+  Template_Files {
+  }
+
+  Resource_Files {
+  }
+
+  Pkgconfig_Files {
+    ACE_TkReactor.pc.in
+  }
+}
diff --git a/ace/ace_xtreactor.mpc b/ace/ace_xtreactor.mpc
new file mode 100644
index 00000000000..9d8c44e666f
--- /dev/null
+++ b/ace/ace_xtreactor.mpc
@@ -0,0 +1,30 @@
+//  -*- MPC -*- now wouldn't this be cool...
+// $Id$
+
+project(ACE_XtReactor) : acedefaults, core, acelib, ace_xt {
+
+  sharedname   = ACE_XtReactor
+  dynamicflags = ACE_XTREACTOR_BUILD_DLL
+
+  Source_Files {
+    XtReactor.cpp
+  }
+
+  Header_Files {
+    XtReactor.h
+    ACE_XtReactor_export.h
+  }
+
+  Inline_Files {
+  }
+
+  Template_Files {
+  }
+
+  Resource_Files {
+  }
+
+  Pkgconfig_Files {
+    ACE_XtReactor.pc.in
+  }
+}