1 files changed, 60 insertions, 33 deletions

diff --git a/examples/ASX/Event_Server/Event_Server/Options.h b/examples/ASX/Event_Server/Event_Server/Options.h
index 5a7a541b835..596b2b48cc3 100644
--- a/examples/ASX/Event_Server/Event_Server/Options.h
+++ b/examples/ASX/Event_Server/Event_Server/Options.h
@@ -14,61 +14,88 @@
 class Options
 {
 public:
-  Options (void);
-  ~Options (void);
+  static Options *instance (void);
+
   void parse_args (int argc, char *argv[]);
 
-  void   stop_timer (void);
-  void   start_timer (void);
+  void stop_timer (void);
+  void start_timer (void);
 
-  void   thr_count (size_t count);
+  void thr_count (size_t count);
   size_t thr_count (void);
 
-  void	 initial_queue_length (size_t length);
+  void initial_queue_length (size_t length);
   size_t initial_queue_length (void);
 
-  void   high_water_mark (size_t size);
+  void high_water_mark (size_t size);
   size_t high_water_mark (void);
 
-  void   low_water_mark (size_t size);
+  void low_water_mark (size_t size);
   size_t low_water_mark (void);
 
-  void	 message_size (size_t size);
+  void message_size (size_t size);
   size_t message_size (void);
 
-  void   iterations (size_t n);
+  void iterations (size_t n);
   size_t iterations (void);
 
-  void   t_flags (long flag);
-  long   t_flags (void);
+  void t_flags (long flag);
+  long t_flags (void);
 
-  void   supplier_port (char *port);
-  char   *supplier_port (void);
+  void supplier_port (u_short port);
+  u_short supplier_port (void);
 
-  void   consumer_port (char *port);
-  char	 *consumer_port (void);
+  void consumer_port (u_short port);
+  u_short consumer_port (void);
 
-  int    debug (void);
-  int    verbose (void);
+  int debug (void);
+  int verbose (void);
 
-  void   print_results (void);
+  void print_results (void);
 
 private:
-  ACE_Profile_Timer itimer_;	        /* Time the process */
-  size_t	thr_count_;		/* Number of threads to spawn */
-  long		t_flags_;		/* Flags to thr_create() */
-  size_t	high_water_mark_;	/* ACE_Task high water mark */
-  size_t	low_water_mark_;        /* ACE_Task low water mark */
-  size_t	message_size_;		/* Size of a message */
-  size_t	initial_queue_length_;	/* Initial number of items in the queue */
-  size_t	iterations_;		/* Number of iterations to run the test program */
-  int		debugging_;		/* Extra debugging info */
-  int		verbosity_;		/* Extra verbose messages */
-  char		*consumer_port_;	/* Port that the Consumer_Router is using */
-  char		*supplier_port_;	/* Port that the Supplier_Router is using */
-};
+  Options (void);
+  ~Options (void);
+
+  ACE_Profile_Timer itimer_;	        
+  // Time the process.
+
+  size_t thr_count_;		
+  // Number of threads to spawn.
+
+  long t_flags_;		
+  // Flags to thr_create().
+
+  size_t high_water_mark_;	
+  // ACE_Task high water mark.
 
-extern Options options;
+  size_t low_water_mark_;        
+  // ACE_Task low water mark.
+
+  size_t message_size_;		
+  // Size of a message.
+
+  size_t initial_queue_length_;	
+  // Initial number of items in the queue.
+
+  size_t iterations_;		
+  // Number of iterations to run the test program.
+
+  int debugging_;		
+  // Extra debugging info.
+
+  int verbosity_;		
+  // Extra verbose messages.
+
+  u_short consumer_port_;	
+  // Port that the Consumer_Router is using.
+
+  u_short supplier_port_;	
+  // Port that the Supplier_Router is using.
+
+  static Options *instance_;
+  // Static Singleton.
+};
 
 #include "Options.i"
 #endif /* ACE_HAS_THREADS */