Windows fixes (not complete)

3 files changed, 18 insertions, 19 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
index 424b05ecd21..e5359d14ae8 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
@@ -37,7 +37,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_ORBSVCS_Export TAO_Metrics_Logger_Data
+class TAO_Metrics_Export TAO_Metrics_Logger_Data
 {
   // = TITLE
   //   Defines a class for logger data.
@@ -85,7 +85,7 @@ public:
 
 
 
-class TAO_ORBSVCS_Export TAO_Metrics_Logger
+class TAO_Metrics_Export TAO_Metrics_Logger
   : public ACE_Task<ACE_MT_SYNCH>, public POA_Metrics::QoSLogger
   // = TITLE
   //   This class implements a Metrics QoS logger.
@@ -115,7 +115,7 @@ public:
   // Active object loop for processing logged data.
 
   void send_banner (const char *banner,
-                    CORBA::Environment &ACE_TRY_ENV = 
+                    CORBA::Environment &ACE_TRY_ENV =
                         CORBA::Environment::default_environment ());
   // Sends a banner to be written to the log file and to the visualization browser.
 
@@ -124,7 +124,7 @@ public:
 
   void log_aggregate_QoS (const Metrics::QoSParameter_Set & qos_params,
                           Metrics::Time interval,
-                          CORBA::Environment &ACE_TRY_ENV = 
+                          CORBA::Environment &ACE_TRY_ENV =
                             CORBA::Environment::default_environment ());
   // Reports the aggregate QoS information for all operations
   // to the passed QoS logger.
@@ -135,20 +135,20 @@ public:
   // to the passed QoS logger.
 
   void set_identities (const Metrics::ProbeIdentity_Set & probe_identities,
-                       CORBA::Environment &ACE_TRY_ENV = 
+                       CORBA::Environment &ACE_TRY_ENV =
                          CORBA::Environment::default_environment ());
-  // Binds the names of various timeprobes to their identifiers so 
+  // Binds the names of various timeprobes to their identifiers so
   // that ids alone can be used (for efficiency) in passing data.
 
   void set_identity (const Metrics::ProbeIdentity_t & probe_identity,
-                     CORBA::Environment &ACE_TRY_ENV = 
+                     CORBA::Environment &ACE_TRY_ENV =
                        CORBA::Environment::default_environment ());
-  // Binds the names of various timeprobes to their identifiers so 
+  // Binds the names of various timeprobes to their identifiers so
   // that ids alone can be used (for efficiency) in passing data.
 
   void log_timeprobe_data (const Metrics::TimeprobeParameter_Set & timeprobe_params,
                            Metrics::Time interval,
-                           CORBA::Environment &ACE_TRY_ENV = 
+                           CORBA::Environment &ACE_TRY_ENV =
                              CORBA::Environment::default_environment ());
   // Reports timeprobe data collected since last run.
 
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
index 538d3d3a3da..9bd6f30a3da 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
@@ -22,7 +22,7 @@
 #include "Metrics_FrameManager.h"
 #include "Metrics_Utils.h"
 
-class TAO_ORBSVCS_Export TAO_Metrics_UpcallMonitor
+class TAO_Metrics_Export TAO_Metrics_UpcallMonitor
   : public POA_Metrics::QoSMonitor
 {
   // = TITLE
@@ -55,7 +55,7 @@ public:
 
 
   TAO_Metrics_UpcallMonitor ();
-  // Default constructor. 
+  // Default constructor.
 
   ~TAO_Metrics_UpcallMonitor ();
   // Destructor.
@@ -89,7 +89,7 @@ public:
   virtual void get_aggregate_QoS_set (
       const Metrics::Handle_Set_t & handle_set,
       Metrics::QoSParameter_Set_out qos_set,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_4,
@@ -125,7 +125,7 @@ private:
 };
 
 
-class TAO_ORBSVCS_Export TAO_Metrics_ReportingUpcallMonitor
+class TAO_Metrics_Export TAO_Metrics_ReportingUpcallMonitor
   : public POA_Metrics::ReportingQoSMonitor
 {
   // = TITLE
@@ -159,7 +159,7 @@ public:
 
 
   TAO_Metrics_ReportingUpcallMonitor ();
-  // Default constructor. 
+  // Default constructor.
 
   ~TAO_Metrics_ReportingUpcallMonitor ();
   // Destructor.
@@ -193,7 +193,7 @@ public:
   virtual void get_aggregate_QoS_set (
       const Metrics::Handle_Set_t & handle_set,
       Metrics::QoSParameter_Set_out qos_set,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_4,
@@ -204,7 +204,7 @@ public:
   virtual void report_aggregate_QoS (
       Metrics::QoSLogger_ptr logger,
       Metrics::Time interval,
-      CORBA::Environment &ACE_TRY_ENV = 
+      CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::NIL_LOGGER,
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
index a452b296edf..516926f814a 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
@@ -15,13 +15,12 @@
 #include "ace/Singleton.h"
 #include "orbsvcs/RtecSchedulerC.h"
 #include "orbsvcs/MetricsC.h"
-#include "orbsvcs/orbsvcs_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_ORBSVCS_Export TAO_Metrics_Utils
+class TAO_Metrics_Export TAO_Metrics_Utils
 {
   // = TITLE
   //   Defines a class for various metrics utility functions.
@@ -76,7 +75,7 @@ private:
 };
 
 
-struct TAO_ORBSVCS_Export WSOA_Metrics_Handles
+struct TAO_Metrics_Export WSOA_Metrics_Handles
 {
   // = TITLE
   //   Defines a helper class for WSOA METRICS INSTRUMENTATION.