ChangeLogTag:Wed May 06 23:51:37 1998 Carlos O'Ryan <coryan@JIG>

9 files changed, 283 insertions, 43 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 3d0c3e310ae..e282ed5f8e5 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,20 @@
+Wed May 06 23:51:37 1998  Carlos O'Ryan  <coryan@JIG>
+
+	* orbsvcs/tests/EC_Multiple/EC_Multiple.dsp: 
+	* orbsvcs/tests/EC_Multiple/EC_Multiple.dsw: 
+	* orbsvcs/tests/EC_Multiple/EC_Multiple.h: 
+	* orbsvcs/tests/EC_Multiple/EC_Multiple.cpp: 
+	  The test now compiles on NT, it lacked a project file and we had
+	  to workaround some MSVC++ bugs.
+
+	* orbsvcs/orbsvcs.dsw: 
+	  Added the tests to the main workspace.
+
+	* orbsvcs/orbsvcs/orbsvcs.dsp: 
+	* orbsvcs/orbsvcs/Event/EC_Gateway.h: 
+	  The export macro was wrong and Event/EC_Gateway files were not
+	  in the project file.
+
 Wed May  6 18:16:42 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* tests/NestedUpcall: Added the new "one-button" features for the
diff --git a/TAO/orbsvcs/orbsvcs.dsw b/TAO/orbsvcs/orbsvcs.dsw
index d75c2d36bed..5e3302501ce 100644
--- a/TAO/orbsvcs/orbsvcs.dsw
+++ b/TAO/orbsvcs/orbsvcs.dsw
@@ -18,6 +18,30 @@ Package=<4>
 

 ###############################################################################

 

+Project: "EC_Multiple"=.\tests\EC_Multiple\EC_Multiple.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Event_Latency"=.\tests\Event_Latency\Event_Latency.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "Event_Service"=.\Event_Service\Event_Service.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index fdf9fc69061..1548007555f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -37,7 +37,7 @@
 #include "orbsvcs/RtecEventCommS.h"
 #include "orbsvcs/Channel_Clients_T.h"
 
-class TAO_Export TAO_EC_Gateway
+class TAO_ORBSVCS_Export TAO_EC_Gateway
 //
 // = TITLE
 //   Event Channel Gateway.
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
index 08d690c74a3..9de9276ddc9 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
@@ -142,6 +142,10 @@ SOURCE=.\Event\Dispatching_Modules.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Event\EC_Gateway.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Naming\Entries.cpp

 # End Source File

 # Begin Source File

@@ -282,6 +286,10 @@ SOURCE=.\Event\Dispatching_Modules.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Event\EC_Gateway.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Naming\Entries.h

 # End Source File

 # Begin Source File

@@ -438,7 +446,7 @@ InputName=CosLifeCycle
 

 BuildCmds= \

 	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+          -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -474,7 +482,7 @@ InputName=CosNaming
 

 BuildCmds= \

 	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+          -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -503,7 +511,7 @@ InputName=CosNaming
 

 BuildCmds= \

 	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+          -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -539,7 +547,7 @@ InputName=CosTimeBase
 

 BuildCmds= \

 	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+          -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -568,7 +576,7 @@ InputName=CosTimeBase
 

 BuildCmds= \

 	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+          -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -604,7 +612,7 @@ InputName=Logger
 

 BuildCmds= \

 	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+          -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -633,7 +641,7 @@ InputName=Logger
 

 BuildCmds= \

 	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+          -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -669,7 +677,7 @@ InputName=RtecEventChannelAdmin
 

 BuildCmds= \

 	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+          -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -698,7 +706,7 @@ InputName=RtecEventChannelAdmin
 

 BuildCmds= \

 	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+          -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -734,7 +742,7 @@ InputName=RtecEventComm
 

 BuildCmds= \

 	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+          -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -763,7 +771,7 @@ InputName=RtecEventComm
 

 BuildCmds= \

 	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+          -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -799,7 +807,7 @@ InputName=RtecScheduler
 

 BuildCmds= \

 	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+          -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -828,7 +836,7 @@ InputName=RtecScheduler
 

 BuildCmds= \

 	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+          -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index bdc11b50846..bf34b2515e1 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -953,7 +953,11 @@ Test_ECG::push_consumer (void *consumer_cookie,
 	  // is the end of the frame.
 	  // + Use the start of the test to keep the current frame.
 	  // + Use the last execution.
-	  this->stats_[ID].laxity_[count] = 1 + (s - now)/interval/1000.0;
+
+	  // Work around MSVC++ bug, it does not not how to convert an
+	  // unsigned 64 bit int into a long....
+	  CORBA::ULong tmp = ACE_static_cast(CORBA::ULong,(s - now));
+	  this->stats_[ID].laxity_[count] = 1 + tmp/1000.0/interval;
 	  count++;
 	}
       else
@@ -1042,7 +1046,10 @@ Test_ECG::dump_results (void)
       ACE_OS::sprintf (buf, "LP%02.2d", i);
       this->dump_results (buf, this->stats_[i + this->hp_consumers_]);
     }
-  double usec = (this->test_stop_ - this->test_start_) / 1000.0;
+  // the cast is to workaround a msvc++ bug...
+  CORBA::ULong tmp = ACE_static_cast(CORBA::ULong,
+				     this->test_stop_ - this->test_start_);
+  double usec =  tmp / 1000.0;
   ACE_DEBUG ((LM_DEBUG, "Time[TOTAL]: %.3f\n", usec));
 }
 
@@ -1050,23 +1057,27 @@ void
 Test_ECG::dump_results (const char* name, Stats& stats)
 {
   // @@ We are reporting the information without specifics about 
-  double usec = stats.total_time_ / 1000.0;
+  // the cast is to workaround a msvc++ bug...
+  double usec = ACE_static_cast(CORBA::ULong,stats.total_time_) / 1000.0;
   ACE_DEBUG ((LM_DEBUG, "Time[LCL,%s]: %.3f\n", name, usec));
   int i;
   for (i = 1; i < stats.lcl_count_ - 1; ++i)
     {
-      usec = stats.lcl_latency_[i] / 1000.0;
+      // the cast is to workaround a msvc++ bug...
+      usec = ACE_static_cast(CORBA::ULong,stats.lcl_latency_[i]) / 1000.0;
       ACE_DEBUG ((LM_DEBUG, "Latency[LCL,%s]: %.3f\n", name, usec));
 
       double percent = stats.laxity_[i] * 100.0;
       ACE_DEBUG ((LM_DEBUG, "Laxity[LCL,%s]: %.3f\n", name, percent));
 
-      usec = (stats.end_[i] - this->test_start_) / 1000.0;
+      // the cast is to workaround a msvc++ bug...
+      usec = ACE_static_cast(CORBA::ULong,stats.end_[i] - this->test_start_) / 1000.0;
       ACE_DEBUG ((LM_DEBUG, "Completion[LCL,%s]: %.3f\n", name, usec));
     }
   for (i = 1; i < stats.rmt_count_ - 1; ++i)
     {
-      double usec = stats.rmt_latency_[i] / 1000.0;
+      // the cast is to workaround a msvc++ bug...
+      double usec = ACE_static_cast(CORBA::ULong,stats.rmt_latency_[i]) / 1000.0;
       ACE_DEBUG ((LM_DEBUG, "Latency[RMT,%s]: %.3f\n", name, usec));
     }
 }
@@ -1127,24 +1138,24 @@ Test_ECG::parse_args (int argc, char *argv [])
 	case 'h':
 	  {
 	    char* aux;
-	    char* arg = strtok_r (get_opt.optarg, ",", &aux);
+		char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
 
 	    this->hp_suppliers_ = ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->hp_consumers_ = ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->hp_workload_ = ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->hp_interval_ = ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->hp_message_count_ = ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->hps_event_a_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->hps_event_b_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->hpc_event_a_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->hpc_event_b_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
 	  }
 	  break;
@@ -1152,24 +1163,24 @@ Test_ECG::parse_args (int argc, char *argv [])
 	case 'w':
 	  {
 	    char* aux;
-	    char* arg = strtok_r (get_opt.optarg, ",", &aux);
+		char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
 
 	    this->lp_suppliers_ = ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->lp_consumers_ = ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->lp_workload_ = ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->lp_interval_ = ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->lp_message_count_ = ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->lps_event_a_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->lps_event_b_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->lpc_event_a_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
-	    arg = strtok_r (0, ",", &aux);
+		arg = ACE_OS::strtok_r (0, ",", &aux);
 	    this->lpc_event_b_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
 	  }
 	  break;
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsp
new file mode 100644
index 00000000000..b97209fbf91
--- /dev/null
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsp
@@ -0,0 +1,110 @@
+# Microsoft Developer Studio Project File - Name="EC_Multiple" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=EC_Multiple - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "EC_Multiple.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "EC_Multiple.mak" CFG="EC_Multiple - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "EC_Multiple - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "EC_Multiple - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "EC_Multiple - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+

+!ELSEIF  "$(CFG)" == "EC_Multiple - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I "../.." /I "../../.." /I "../../../.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 orbsvcs.lib TAO.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "EC_Multiple - Win32 Release"

+# Name "EC_Multiple - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\EC_Multiple.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\EC_Multiple.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Scheduler_Runtime1.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Scheduler_Runtime2.h

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsw b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsw
new file mode 100644
index 00000000000..016d97619a5
--- /dev/null
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "EC_Multiple"=.\EC_Multiple.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index 5c2cbfb89df..eddfd15a913 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -227,7 +227,7 @@ private:
   void wait_until_ready (void);
   // Block event delivery until all the consumers are ready.
 
-  class Stats;
+  struct Stats;
   void dump_results (const char* name, Stats& stats);
   // Dump the results for a particular consumer.
 
@@ -327,13 +327,13 @@ private:
 
   struct Stats {
     ACE_hrtime_t total_time_;
-    float laxity_[Test_ECG::MAX_EVENTS];
-    ACE_hrtime_t lcl_latency_[Test_ECG::MAX_EVENTS];
-    ACE_hrtime_t end_[Test_ECG::MAX_EVENTS];
+    float laxity_[MAX_EVENTS];
+    ACE_hrtime_t lcl_latency_[MAX_EVENTS];
+    ACE_hrtime_t end_[MAX_EVENTS];
     int lcl_count_;
     // We keep laxity and total_time stats only for the local events.
 
-    ACE_hrtime_t rmt_latency_[Test_ECG::MAX_EVENTS];
+    ACE_hrtime_t rmt_latency_[MAX_EVENTS];
     int rmt_count_;
   };
   Stats stats_[Test_ECG::MAX_CONSUMERS];
diff --git a/TAO/orbsvcs/tests/tests.dsw b/TAO/orbsvcs/tests/tests.dsw
new file mode 100644
index 00000000000..dbd471f7593
--- /dev/null
+++ b/TAO/orbsvcs/tests/tests.dsw
@@ -0,0 +1,41 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "EC_Multiple"=.\EC_Multiple\EC_Multiple.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Event_Latency"=.\Event_Latency\Event_Latency.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+