Merge pull request #1444 from jwillemsen/jwi-stdstring

Use std string operation instead of ACE_OS

7 files changed, 24 insertions, 25 deletions

diff --git a/ACE/ASNMP/tests/test_config.h b/ACE/ASNMP/tests/test_config.h
index ea23390b9c9..39601b60064 100644
--- a/ACE/ASNMP/tests/test_config.h
+++ b/ACE/ASNMP/tests/test_config.h
@@ -59,7 +59,7 @@
 #define ACE_NEW_THREAD \
 do {\
   ACE_LOG_MSG->msg_ostream (ace_file_stream.output_file ()); \
-  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER ); \
+  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER); \
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); \
 } while (0)
 
@@ -133,7 +133,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
     return -1;
 
   ACE_LOG_MSG->msg_ostream (ace_file_stream.output_file ());
-  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER );
+  ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER);
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
 
   return 0;
diff --git a/ACE/Kokyu/Kokyu_defs.inl b/ACE/Kokyu/Kokyu_defs.inl
index a6639c429ec..b775ae93936 100644
--- a/ACE/Kokyu/Kokyu_defs.inl
+++ b/ACE/Kokyu/Kokyu_defs.inl
@@ -80,5 +80,5 @@ bool operator != (const Kokyu::ConfigInfo& lhs,
 {
   return (lhs.preemption_priority_ != rhs.preemption_priority_ ||
           lhs.thread_priority_ != rhs.thread_priority_ ||
-          lhs.dispatching_type_ != rhs.dispatching_type_ );
+          lhs.dispatching_type_ != rhs.dispatching_type_);
 }
diff --git a/ACE/ace/ATM_Acceptor.h b/ACE/ace/ATM_Acceptor.h
index 788b63c4e81..b2eaf7becc8 100644
--- a/ACE/ace/ATM_Acceptor.h
+++ b/ACE/ace/ATM_Acceptor.h
@@ -90,7 +90,7 @@ public:
               ACE_ATM_QoS qos = ACE_ATM_QoS());
 
   /// Get the local address currently listening on
-  int get_local_addr( ACE_ATM_Addr &local_addr );
+  int get_local_addr(ACE_ATM_Addr &local_addr);
 
   // = Meta-type info
   typedef ACE_ATM_Addr PEER_ADDR;
diff --git a/ACE/ace/ATM_Connector.cpp b/ACE/ace/ATM_Connector.cpp
index 42dd0f7a725..3c866fbdc40 100644
--- a/ACE/ace/ATM_Connector.cpp
+++ b/ACE/ace/ATM_Connector.cpp
@@ -67,7 +67,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream,
   int result = ACE_OS::connect( s,
                                 ( struct sockaddr *)saddr,
                                 sizeof( struct sockaddr_atm ),
-                                qos_params );
+                                qos_params);
 
   if ( result != 0 )
     ACE_OS::printf( "ATM_Connector(connect): connection failed, %d\n",
diff --git a/ACE/ace/ATM_Connector.inl b/ACE/ace/ATM_Connector.inl
index e35f4085466..3980c234b2c 100644
--- a/ACE/ace/ATM_Connector.inl
+++ b/ACE/ace/ATM_Connector.inl
@@ -72,7 +72,7 @@ ACE_ATM_Connector::add_leaf (ACE_ATM_Stream &current_stream,
 #elif defined (ACE_HAS_FORE_ATM_WS2)
   struct sockaddr_atm *saddr = (struct sockaddr_atm *)remote_sap.get_addr();
   ACE_QoS cqos = qos.get_qos();
-  int addr_len = sizeof( struct sockaddr_atm );
+  int addr_len = sizeof( struct sockaddr_atm);
 
   ACE_QoS_Params qos_params(0,
                             0,
@@ -80,7 +80,7 @@ ACE_ATM_Connector::add_leaf (ACE_ATM_Stream &current_stream,
                             0,
                             (JL_SENDER_ONLY));
 
-  ACE_OS::printf( "ATM_Connector::add_leaf: connecting...\n" );
+  ACE_OS::printf( "ATM_Connector::add_leaf: connecting...\n");
 
   ACE_HANDLE result = ACE_OS::join_leaf(current_stream.get_handle(),
                                         (struct sockaddr *)saddr,
diff --git a/ACE/ace/ATM_Params.h b/ACE/ace/ATM_Params.h
index 0981a528e08..32ff0a99e36 100644
--- a/ACE/ace/ATM_Params.h
+++ b/ACE/ace/ATM_Params.h
@@ -89,70 +89,70 @@ public:
   ~ACE_ATM_Params ();
 
   /// Get protocol family.
-  int get_protocol_family (void) const;
+  int get_protocol_family () const;
 
   /// Set protocol family.
   void set_protocol_family (int);
 
   /// Get protocol.
-  int get_protocol (void) const;
+  int get_protocol () const;
 
   /// Set protocol.
   void set_protocol (int);
 
   /// Get type.
-  int get_type (void) const;
+  int get_type () const;
 
   /// Set type.
   void set_type (int);
 
   /// Get protocol info.
-  ACE_Protocol_Info *get_protocol_info( void );
+  ACE_Protocol_Info *get_protocol_info();
 
   /// Set protocol info.
   void set_protocol_info( ACE_Protocol_Info *);
 
   /// Get socket group.
-  ACE_SOCK_GROUP get_sock_group( void );
+  ACE_SOCK_GROUP get_sock_group();
 
   /// Set socket group.
   void set_sock_group( ACE_SOCK_GROUP );
 
   /// Get socket flags.
-  u_long get_flags( void );
+  u_long get_flags();
 
   /// Set socket flags.
-  void set_flags( u_long );
+  void set_flags(u_long);
 
   /// Get reuse_addr flag.
-  int get_reuse_addr (void) const;
+  int get_reuse_addr () const;
 
   /// Set reuse_addr flag.
   void set_reuse_addr (int);
 
   /// Get device.
-  const char* get_device (void) const;
+  const char* get_device () const;
 
   /// Get info.
-  Param_Info* get_info (void) const;
+  Param_Info* get_info () const;
 
   /// Set info.
   void set_info (Param_Info *);
 
   /// Get r/w flag.
-  int get_rw_flag (void) const;
+  int get_rw_flag () const;
 
   /// Set r/w flag.
   void set_rw_flag (int);
 
   /// Get user data.
-  Param_Udata* get_user_data (void) const;
+  Param_Udata* get_user_data () const;
 
   /// Set user data.
   void set_user_data (Param_Udata*);
 
   /// Get open flag.
-  int get_oflag (void) const;
+  int get_oflag () const;
 
   /// Set open flag.
   void set_oflag (int);
diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.h b/ACE/apps/JAWS2/HTTPU/http_headers.h
index 839df6d7ff5..798f1c502b7 100644
--- a/ACE/apps/JAWS2/HTTPU/http_headers.h
+++ b/ACE/apps/JAWS2/HTTPU/http_headers.h
@@ -144,17 +144,16 @@ protected:
 class HTTPU_Export HTTP_Headers : public JAWS_Header_Info, public HTTP_HCodes
 {
 public:
-  const char *header( int name ) const;
-  const char *value( int name );
-  const char *value_next( int name );
-  void value_reset ( void );
+  const char *header(int name) const;
+  const char *value(int name);
+  const char *value_next(int name);
+  void value_reset ();
 
 public:
   HTTP_Headers (void);
 
   const char *header_token (int name) const;
   const char *header_strings (int name) const;
-
 };