Mon Sep 8 17:59:55 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/Base_Thread_Adapter.h:
        * ace/CDR_Base.inl:
        * ace/CDR_Base.cpp:
        * ace/ETCL/ETCL_l.cpp:
        * ace/ETCL/ETCL_l.cpp.diff:
        * ace/ETCL/ETCL_y.cpp:
        * ace/ETCL/ETCL_y.cpp.diff:
        * ace/Global_Macros.h:
        * ace/Handle_Set.cpp:
        * ace/OS_NS_stdlib.cpp:
        * ace/OS_NS_string.cpp:
          C++11 deprecated the register keyword, so introduce a new 
          ACE_REGISTER define which normall expands to register, but
          to nothing with C++11

4 files changed, 44 insertions, 44 deletions

diff --git a/ACE/ace/ETCL/ETCL_l.cpp b/ACE/ace/ETCL/ETCL_l.cpp
index 8ed7a01645a..1fad3abf268 100644
--- a/ACE/ace/ETCL/ETCL_l.cpp
+++ b/ACE/ace/ETCL/ETCL_l.cpp
@@ -625,10 +625,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 YY_DECL
   {
-  register yy_state_type yy_current_state;
-  register char *yy_cp = 0;
-  register char *yy_bp = 0;
-  register int yy_act;
+  ACE_REGISTER yy_state_type yy_current_state;
+  ACE_REGISTER char *yy_cp = 0;
+  ACE_REGISTER char *yy_bp = 0;
+  ACE_REGISTER int yy_act;
 
 //#line 50 "ETCL/ETCL.ll"
 
@@ -672,7 +672,7 @@ YY_DECL
 yy_match:
     do
       {
-      register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+      ACE_REGISTER YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
       if ( yy_accept[yy_current_state] )
         {
         yy_last_accepting_state = yy_current_state;
@@ -1091,9 +1091,9 @@ case YY_STATE_EOF(INITIAL):
 
 static int yy_get_next_buffer()
   {
-  register char *dest = yy_current_buffer->yy_ch_buf;
-  register char *source = yytext_ptr;
-  register int number_to_move, i;
+  ACE_REGISTER char *dest = yy_current_buffer->yy_ch_buf;
+  ACE_REGISTER char *source = yytext_ptr;
+  ACE_REGISTER int number_to_move, i;
   int ret_val;
 
   if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
@@ -1223,14 +1223,14 @@ static int yy_get_next_buffer()
 
 static yy_state_type yy_get_previous_state()
   {
-  register yy_state_type yy_current_state;
-  register char *yy_cp;
+  ACE_REGISTER yy_state_type yy_current_state;
+  ACE_REGISTER char *yy_cp;
 
   yy_current_state = yy_start;
 
   for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
     {
-    register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+    ACE_REGISTER YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
     if ( yy_accept[yy_current_state] )
       {
       yy_last_accepting_state = yy_current_state;
@@ -1262,10 +1262,10 @@ static yy_state_type yy_try_NUL_trans( yy_current_state )
 yy_state_type yy_current_state;
 #endif
   {
-  register int yy_is_jam;
-  register char *yy_cp = yy_c_buf_p;
+  ACE_REGISTER int yy_is_jam;
+  ACE_REGISTER char *yy_cp = yy_c_buf_p;
 
-  register YY_CHAR yy_c = 1;
+  ACE_REGISTER YY_CHAR yy_c = 1;
   if ( yy_accept[yy_current_state] )
     {
     yy_last_accepting_state = yy_current_state;
@@ -1286,14 +1286,14 @@ yy_state_type yy_current_state;
 #if 0
 #ifndef YY_NO_UNPUT
 #ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
+static void yyunput( int c, ACE_REGISTER char *yy_bp )
 #else
 static void yyunput( c, yy_bp )
 int c;
-register char *yy_bp;
+ACE_REGISTER char *yy_bp;
 #endif
   {
-  register char *yy_cp = yy_c_buf_p;
+  ACE_REGISTER char *yy_cp = yy_c_buf_p;
 
   /* undo effects of setting up yytext */
   *yy_cp = yy_hold_char;
@@ -1301,10 +1301,10 @@ register char *yy_bp;
   if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
     { /* need to shift things up to make room */
     /* +2 for EOB chars. */
-    register int number_to_move = yy_n_chars + 2;
-    register char *dest = &yy_current_buffer->yy_ch_buf[
+    ACE_REGISTER int number_to_move = yy_n_chars + 2;
+    ACE_REGISTER char *dest = &yy_current_buffer->yy_ch_buf[
           yy_current_buffer->yy_buf_size + 2];
-    register char *source =
+    ACE_REGISTER char *source =
         &yy_current_buffer->yy_ch_buf[number_to_move];
 
     while ( source > yy_current_buffer->yy_ch_buf )
@@ -1768,7 +1768,7 @@ yyconst char *s2;
 int n;
 #endif
   {
-  register int i;
+  ACE_REGISTER int i;
   for ( i = 0; i < n; ++i )
     s1[i] = s2[i];
   }
@@ -1782,7 +1782,7 @@ static int yy_flex_strlen( s )
 yyconst char *s;
 #endif
   {
-  register int n;
+  ACE_REGISTER int n;
   for ( n = 0; s[n]; ++n )
     ;
 
diff --git a/ACE/ace/ETCL/ETCL_l.cpp.diff b/ACE/ace/ETCL/ETCL_l.cpp.diff
index 2365305100d..aba0a063754 100644
--- a/ACE/ace/ETCL/ETCL_l.cpp.diff
+++ b/ACE/ace/ETCL/ETCL_l.cpp.diff
@@ -117,11 +117,11 @@
 @@ -628,13 +621,11 @@
  YY_DECL
  	{
- 	register yy_state_type yy_current_state;
--	register char *yy_cp, *yy_bp;
-+	register char *yy_cp = 0;
-+  register char *yy_bp = 0;
- 	register int yy_act;
+ 	ACE_REGISTER yy_state_type yy_current_state;
+-	ACE_REGISTER char *yy_cp, *yy_bp;
++	ACE_REGISTER char *yy_cp = 0;
++  ACE_REGISTER char *yy_bp = 0;
+ 	ACE_REGISTER int yy_act;
 
 -#line 50 "ETCL.ll"
 -
@@ -441,7 +441,7 @@
 +#if 0
  #ifndef YY_NO_UNPUT
  #ifdef YY_USE_PROTOS
- static void yyunput( int c, register char *yy_bp )
+ static void yyunput( int c, ACE_REGISTER char *yy_bp )
 @@ -1332,7 +1322,7 @@
  	yy_c_buf_p = yy_cp;
  	}
diff --git a/ACE/ace/ETCL/ETCL_y.cpp b/ACE/ace/ETCL/ETCL_y.cpp
index c669a621017..131bfecc404 100644
--- a/ACE/ace/ETCL/ETCL_y.cpp
+++ b/ACE/ace/ETCL/ETCL_y.cpp
@@ -489,9 +489,9 @@ __yy_memcpy (to, from, count)
      char *from;
      unsigned int count;
 {
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+  ACE_REGISTER char *f = from;
+  ACE_REGISTER char *t = to;
+  ACE_REGISTER int i = count;
 
   while (i-- > 0)
     *t++ = *f++;
@@ -504,9 +504,9 @@ __yy_memcpy (to, from, count)
 static void
 __yy_memcpy (char *to, char *from, unsigned int count)
 {
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
+  ACE_REGISTER char *t = to;
+  ACE_REGISTER char *f = from;
+  ACE_REGISTER int i = count;
 
   while (i-- > 0)
     *t++ = *f++;
@@ -549,10 +549,10 @@ int
 yyparse(YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 {
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
+  ACE_REGISTER int yystate;
+  ACE_REGISTER int yyn;
+  ACE_REGISTER short *yyssp;
+  ACE_REGISTER YYSTYPE *yyvsp;
   int yyerrstatus;  /*  number of tokens to shift before error messages enabled */
   int yychar1 = 0;    /*  lookahead token as an internal (translated) token number */
 
diff --git a/ACE/ace/ETCL/ETCL_y.cpp.diff b/ACE/ace/ETCL/ETCL_y.cpp.diff
index fe123111232..ef90ad78ef4 100644
--- a/ACE/ace/ETCL/ETCL_y.cpp.diff
+++ b/ACE/ace/ETCL/ETCL_y.cpp.diff
@@ -184,8 +184,8 @@
 -     int count;
 +     unsigned int count;
  {
-   register char *f = from;
-   register char *t = to;
+   ACE_REGISTER char *f = from;
+   ACE_REGISTER char *t = to;
 @@ -474,10 +498,10 @@
  /* This is the most reliable way to avoid incompatibilities
     in available built-in functions on various systems.  */
@@ -193,10 +193,10 @@
 -__yy_memcpy (char *to, char *from, int count)
 +__yy_memcpy (char *to, char *from, unsigned int count)
  {
--  register char *f = from;
-   register char *t = to;
-+  register char *f = from;
-   register int i = count;
+-  ACE_REGISTER char *f = from;
+   ACE_REGISTER char *t = to;
++  ACE_REGISTER char *f = from;
+   ACE_REGISTER int i = count;
  
    while (i-- > 0)
 @@ -486,8 +510,8 @@