summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdullah Sowayan <sowayan@users.noreply.github.com>2007-08-14 14:33:48 +0000
committerAbdullah Sowayan <sowayan@users.noreply.github.com>2007-08-14 14:33:48 +0000
commit9caa4231f1091decf62eec4bee620524c4d2ecc8 (patch)
tree7dd1636fc80f80d66f8a6bbb5c10dce88cf54a5d
parent9d29a887cde2c43ba8ad343fe34dacca41c53e59 (diff)
downloadATCD-9caa4231f1091decf62eec4bee620524c4d2ecc8.tar.gz
Tue Aug 14 14:32:57 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
-rw-r--r--ACE/ChangeLog17
-rw-r--r--ACE/ace/Assert.h6
-rw-r--r--ACE/ace/Global_Macros.h2
-rw-r--r--ACE/ace/Netlink_Addr.h32
-rw-r--r--ACE/ace/Rtems_init.c4
-rw-r--r--ACE/ace/Svc_Conf_y.cpp196
-rw-r--r--ACE/ace/Task_Ex_T.h2
-rw-r--r--ACE/ace/config-win32-common.h8
-rw-r--r--ACE/ace/config-win32-interix.h2
9 files changed, 145 insertions, 124 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 55664900f77..638710435d0 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,10 +1,23 @@
+Tue Aug 14 14:32:57 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
+
+ * ace/Assert.h:
+ * ace/Global_Macros.h:
+ * ace/Netlink_Addr.h:
+ * ace/Rtems_init.c:
+ * ace/Svc_Conf_y.cpp:
+ * ace/Task_Ex_T.h:
+ * ace/config-win32-common.h:
+ * ace/config-win32-interix.h:
+
+ Untabify.
+
Tue Aug 14 13:48:56 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
* bin/fuzz.pl:
- Enabled the Check_for_tab test. The check_for_tab test now will
+ Enabled the Check_for_tab test. The check_for_tab test now will
only check the core of ACE/TAO for tabs. This will prevent the
introduction of new tabs to the core of ACE/TAO. When we remove
- tabs from other directories we will enable checks for those
+ tabs from other directories we will enable checks for those
directories.
Tue Aug 14 08:46:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
diff --git a/ACE/ace/Assert.h b/ACE/ace/Assert.h
index b757ab12f5a..70e9b0060c4 100644
--- a/ACE/ace/Assert.h
+++ b/ACE/ace/Assert.h
@@ -27,9 +27,9 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#define ACE_ASSERT(x) \
(static_cast<void>(0))
#else
-#define ACE_ASSERT(X) \
- ((X) \
- ? static_cast<void>(0) \
+#define ACE_ASSERT(X) \
+ ((X) \
+ ? static_cast<void>(0) \
: ACE_VERSIONED_NAMESPACE_NAME::__ace_assert(__FILE__, __LINE__, ACE_TEXT_CHAR_TO_TCHAR (#X)))
#endif /* ACE_NDEBUG */
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h
index 36575a2469c..e607d812750 100644
--- a/ACE/ace/Global_Macros.h
+++ b/ACE/ace/Global_Macros.h
@@ -28,7 +28,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/config-lite.h"
-#include "ace/Assert.h" // For ACE_ASSERT
+#include "ace/Assert.h" // For ACE_ASSERT
// Start Global Macros
# define ACE_BEGIN_DUMP ACE_TEXT ("\n====\n(%P|%t|%x)\n")
diff --git a/ACE/ace/Netlink_Addr.h b/ACE/ace/Netlink_Addr.h
index bee662b42c4..a012c7e9cac 100644
--- a/ACE/ace/Netlink_Addr.h
+++ b/ACE/ace/Netlink_Addr.h
@@ -55,36 +55,36 @@ public:
~ACE_Netlink_Addr (void);
/**
- * @param naddr sets the nl_ member @see nl_
+ * @param naddr sets the nl_ member @see nl_
*/
int set (const ACE_Netlink_Addr &naddr);
/**
- * sets the pid and groups fields of member nl_ @see nl_
- */
+ * sets the pid and groups fields of member nl_ @see nl_
+ */
void set (int pid, int gid);
/**
- * set nl_ to nl_ @see nl_
- */
+ * set nl_ to nl_ @see nl_
+ */
int set (const sockaddr_nl *, int len);
/**
* @return pid
- */
+ */
int get_pid (void) const;
/**
- * @return the group id @see nl_
- */
+ * @return the group id @see nl_
+ */
int get_gid (void) const;
/**
- * @return addr pointer @see nl_
- */
+ * @return addr pointer @see nl_
+ */
virtual void *get_addr (void) const;
/**
- * @return nl_ member @see nl_ size
- */
+ * @return nl_ member @see nl_ size
+ */
int get_addr_size (void) const;
/**
- * Set a pointer to the address
- */
+ * Set a pointer to the address
+ */
virtual void set_addr (void *, int len= sizeof(sockaddr_nl) );
/// Declare the dynamic allocation hooks.
@@ -97,8 +97,8 @@ private:
* */
int determine_type (void) const;
/**
- * set nl_ @see nl_ to zero and sets address family to default value
- */
+ * set nl_ @see nl_ to zero and sets address family to default value
+ */
void reset (void);
sockaddr_nl nl_;
diff --git a/ACE/ace/Rtems_init.c b/ACE/ace/Rtems_init.c
index 9ad9cd27338..5015e2eec2a 100644
--- a/ACE/ace/Rtems_init.c
+++ b/ACE/ace/Rtems_init.c
@@ -23,9 +23,9 @@
#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_EXECUTIVE_RAM_SIZE (512*1024)
+#define CONFIGURE_EXECUTIVE_RAM_SIZE (512*1024)
-#define CONFIGURE_MICROSECONDS_PER_TICK 10000
+#define CONFIGURE_MICROSECONDS_PER_TICK 10000
#define CONFIGURE_MAXIMUM_SEMAPHORES 100
#define CONFIGURE_MAXIMUM_TASKS 100
diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp
index 7d26b8cd849..cc4cab7a80d 100644
--- a/ACE/ace/Svc_Conf_y.cpp
+++ b/ACE/ace/Svc_Conf_y.cpp
@@ -1,5 +1,5 @@
/* A Bison parser, made by GNU Bison 2.0. */
-
+
/* Skeleton parser for Yacc-like parsing with Bison,
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
@@ -212,7 +212,7 @@ union ace_yyalloc
/* The size of an array large to enough to hold all stacks, each with
N elements. */
# define ACE_YYSTACK_BYTES(N) \
- ((N) * (sizeof (short int) + sizeof (ACE_YYSTYPE)) \
+ ((N) * (sizeof (short int) + sizeof (ACE_YYSTYPE)) \
+ ACE_YYSTACK_GAP_MAXIMUM)
/* Copy COUNT objects from FROM to TO. The source and destination do
@@ -222,13 +222,13 @@ union ace_yyalloc
# define ACE_YYCOPY(To, From, Count) \
__builtin_memcpy (To, From, (Count) * sizeof (*(From)))
# else
-# define ACE_YYCOPY(To, From, Count) \
- do \
- { \
- register ACE_YYSIZE_T ace_yyi; \
- for (ace_yyi = 0; ace_yyi < (Count); ace_yyi++) \
- (To)[ace_yyi] = (From)[ace_yyi]; \
- } \
+# define ACE_YYCOPY(To, From, Count) \
+ do \
+ { \
+ register ACE_YYSIZE_T ace_yyi; \
+ for (ace_yyi = 0; ace_yyi < (Count); ace_yyi++) \
+ (To)[ace_yyi] = (From)[ace_yyi]; \
+ } \
while (0)
# endif
# endif
@@ -238,15 +238,15 @@ union ace_yyalloc
elements in the stack, and ACE_YYPTR gives the new location of the
stack. Advance ACE_YYPTR to a properly aligned location for the next
stack. */
-# define ACE_YYSTACK_RELOCATE(Stack) \
- do \
- { \
- ACE_YYSIZE_T ace_yynewbytes; \
- ACE_YYCOPY (&ace_yyptr->Stack, Stack, ace_yysize); \
- Stack = &ace_yyptr->Stack; \
- ace_yynewbytes = ace_yystacksize * sizeof (*Stack) + ACE_YYSTACK_GAP_MAXIMUM; \
- ace_yyptr += ace_yynewbytes / sizeof (*ace_yyptr); \
- } \
+# define ACE_YYSTACK_RELOCATE(Stack) \
+ do \
+ { \
+ ACE_YYSIZE_T ace_yynewbytes; \
+ ACE_YYCOPY (&ace_yyptr->Stack, Stack, ace_yysize); \
+ Stack = &ace_yyptr->Stack; \
+ ace_yynewbytes = ace_yystacksize * sizeof (*Stack) + ACE_YYSTACK_GAP_MAXIMUM; \
+ ace_yyptr += ace_yynewbytes / sizeof (*ace_yyptr); \
+ } \
while (0)
#endif
@@ -275,7 +275,7 @@ union ace_yyalloc
#define ACE_YYUNDEFTOK 2
#define ACE_YYMAXUTOK 271
-#define ACE_YYTRANSLATE(ACE_YYX) \
+#define ACE_YYTRANSLATE(ACE_YYX) \
((unsigned int) (ACE_YYX) <= ACE_YYMAXUTOK ? ace_yytranslate[ACE_YYX] : ACE_YYUNDEFTOK)
/* ACE_YYTRANSLATE[ACE_YYLEX] -- Bison symbol number corresponding to ACE_YYLEX. */
@@ -499,44 +499,44 @@ static const unsigned char ace_yystos[] =
# define ACE_YYSIZE_T unsigned int
#endif
-#define ace_yyerrok (ace_yyerrstatus = 0)
-#define ace_yyclearin (ace_yychar = ACE_YYEMPTY)
-#define ACE_YYEMPTY (-2)
-#define ACE_YYEOF 0
+#define ace_yyerrok (ace_yyerrstatus = 0)
+#define ace_yyclearin (ace_yychar = ACE_YYEMPTY)
+#define ACE_YYEMPTY (-2)
+#define ACE_YYEOF 0
-#define ACE_YYACCEPT goto ace_yyacceptlab
-#define ACE_YYABORT goto ace_yyabortlab
-#define ACE_YYERROR goto ace_yyerrorlab
+#define ACE_YYACCEPT goto ace_yyacceptlab
+#define ACE_YYABORT goto ace_yyabortlab
+#define ACE_YYERROR goto ace_yyerrorlab
/* Like ACE_YYERROR except do call ace_yyerror. This remains here temporarily
to ease the transition to the new meaning of ACE_YYERROR, for GCC.
Once GCC version 2 has supplanted version 1, this can go. */
-#define ACE_YYFAIL goto ace_yyerrlab
+#define ACE_YYFAIL goto ace_yyerrlab
#define ACE_YYRECOVERING() (!!ace_yyerrstatus)
-#define ACE_YYBACKUP(Token, Value) \
-do \
- if (ace_yychar == ACE_YYEMPTY && ace_yylen == 1) \
- { \
- ace_yychar = (Token); \
- ace_yylval = (Value); \
- ace_yytoken = ACE_YYTRANSLATE (ace_yychar); \
- ACE_YYPOPSTACK; \
- goto ace_yybackup; \
- } \
- else \
- { \
- ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, "syntax error: cannot back up");\
- ACE_YYERROR; \
- } \
-while (0)
+#define ACE_YYBACKUP(Token, Value) \
+ do \
+ if (ace_yychar == ACE_YYEMPTY && ace_yylen == 1) \
+ { \
+ ace_yychar = (Token); \
+ ace_yylval = (Value); \
+ ace_yytoken = ACE_YYTRANSLATE (ace_yychar); \
+ ACE_YYPOPSTACK; \
+ goto ace_yybackup; \
+ } \
+ else \
+ { \
+ ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, "syntax error: cannot back up");\
+ ACE_YYERROR; \
+ } \
+ while (0)
-#define ACE_YYTERROR 1
-#define ACE_YYERRCODE 256
+#define ACE_YYTERROR 1
+#define ACE_YYERRCODE 256
/* ACE_YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
@@ -545,22 +545,22 @@ while (0)
#define ACE_YYRHSLOC(Rhs, K) ((Rhs)[K])
#ifndef ACE_YYLLOC_DEFAULT
-# define ACE_YYLLOC_DEFAULT(Current, Rhs, N) \
- do \
- if (N) \
- { \
- (Current).first_line = ACE_YYRHSLOC (Rhs, 1).first_line; \
- (Current).first_column = ACE_YYRHSLOC (Rhs, 1).first_column; \
- (Current).last_line = ACE_YYRHSLOC (Rhs, N).last_line; \
- (Current).last_column = ACE_YYRHSLOC (Rhs, N).last_column; \
- } \
- else \
- { \
- (Current).first_line = (Current).last_line = \
- ACE_YYRHSLOC (Rhs, 0).last_line; \
- (Current).first_column = (Current).last_column = \
- ACE_YYRHSLOC (Rhs, 0).last_column; \
- } \
+# define ACE_YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
+ if (N) \
+ { \
+ (Current).first_line = ACE_YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = ACE_YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = ACE_YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = ACE_YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ ACE_YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ ACE_YYRHSLOC (Rhs, 0).last_column; \
+ } \
while (0)
#endif
@@ -571,10 +571,10 @@ while (0)
#ifndef ACE_YY_LOCATION_PRINT
# if ACE_YYLTYPE_IS_TRIVIAL
-# define ACE_YY_LOCATION_PRINT(File, Loc) \
- ACE_OS::fprintf (File, "%d.%d-%d.%d", \
- (Loc).first_line, (Loc).first_column, \
- (Loc).last_line, (Loc).last_column)
+# define ACE_YY_LOCATION_PRINT(File, Loc) \
+ ACE_OS::fprintf (File, "%d.%d-%d.%d", \
+ (Loc).first_line, (Loc).first_column, \
+ (Loc).last_line, (Loc).last_column)
# else
# define ACE_YY_LOCATION_PRINT(File, Loc) ((void) 0)
# endif
@@ -597,22 +597,26 @@ while (0)
# define ACE_YYFPRINTF ACE_OS::fprintf
# endif
-# define ACE_YYDPRINTF(Args) \
-do { \
- if (ace_yydebug) \
- ACE_YYFPRINTF Args; \
-} while (0)
-
-# define ACE_YY_SYMBOL_PRINT(Title, Type, Value, Location) \
-do { \
- if (ace_yydebug) \
- { \
- ACE_YYFPRINTF (stderr, "%s ", Title); \
- ace_yysymprint (stderr, \
- Type, Value); \
- ACE_YYFPRINTF (stderr, "\n"); \
- } \
-} while (0)
+# define ACE_YYDPRINTF(Args) \
+ do \
+ { \
+ if (ace_yydebug) \
+ ACE_YYFPRINTF Args; \
+ } \
+ while (0)
+
+# define ACE_YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+ do \
+ { \
+ if (ace_yydebug) \
+ { \
+ ACE_YYFPRINTF (stderr, "%s ", Title); \
+ ace_yysymprint (stderr, \
+ Type, Value); \
+ ACE_YYFPRINTF (stderr, "\n"); \
+ } \
+ } \
+ while (0)
/*------------------------------------------------------------------.
| ace_yy_stack_print -- Print the state stack from its BOTTOM up to its |
@@ -635,11 +639,13 @@ ace_yy_stack_print (bottom, top)
ACE_YYFPRINTF (stderr, "\n");
}
-# define ACE_YY_STACK_PRINT(Bottom, Top) \
-do { \
- if (ace_yydebug) \
- ace_yy_stack_print ((Bottom), (Top)); \
-} while (0)
+# define ACE_YY_STACK_PRINT(Bottom, Top) \
+ do \
+ { \
+ if (ace_yydebug) \
+ ace_yy_stack_print ((Bottom), (Top)); \
+ } \
+ while (0)
/*------------------------------------------------.
@@ -665,11 +671,13 @@ ace_yy_reduce_print (ace_yyrule)
ACE_YYFPRINTF (stderr, "-> %s\n", ace_yytname [ace_yyr1[ace_yyrule]]);
}
-# define ACE_YY_REDUCE_PRINT(Rule) \
-do { \
- if (ace_yydebug) \
- ace_yy_reduce_print (Rule); \
-} while (0)
+# define ACE_YY_REDUCE_PRINT(Rule) \
+ do \
+ { \
+ if (ace_yydebug) \
+ ace_yy_reduce_print (Rule); \
+ } \
+ while (0)
/* Nonzero means print parse trace. It is left uninitialized so that
multiple parsers can coexist. */
@@ -683,7 +691,7 @@ int ace_yydebug;
/* ACE_YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef ACE_YYINITDEPTH
+#ifndef ACE_YYINITDEPTH
# define ACE_YYINITDEPTH 200
#endif
@@ -920,7 +928,7 @@ int ace_yynerrs;
ace_yystate = 0;
ace_yyerrstatus = 0;
ace_yynerrs = 0;
- ace_yychar = ACE_YYEMPTY; /* Cause a token to be read. */
+ ace_yychar = ACE_YYEMPTY; /* Cause a token to be read. */
/* Initialize stack pointers.
Waste one element of value and location stack
@@ -1566,7 +1574,7 @@ ace_yyvsp -= ace_yylen;
| ace_yyerrlab1 -- common code for both syntax error and ACE_YYERROR. |
`-------------------------------------------------------------*/
ace_yyerrlab1:
- ace_yyerrstatus = 3; /* Each real token shifted decrements this. */
+ ace_yyerrstatus = 3; /* Each real token shifted decrements this. */
for (;;)
{
diff --git a/ACE/ace/Task_Ex_T.h b/ACE/ace/Task_Ex_T.h
index 6c341560818..8a8da2a63c8 100644
--- a/ACE/ace/Task_Ex_T.h
+++ b/ACE/ace/Task_Ex_T.h
@@ -42,7 +42,7 @@ template <ACE_SYNCH_DECL> class ACE_Module;
* template <ACE_SYNCH_DECL, ACE_MESSAGE_TYPE = ACE_Message_Block>
* class ACE_Task : public ACE_Task_Base
* {
- * // use here the code from ACE_Task_Ex using ACE_Message_Queue_Ex
+ * // use here the code from ACE_Task_Ex using ACE_Message_Queue_Ex
* };
*
* Now specialized version of ACE_Task with ACE_Message_Block as its
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index 39cafc0cc44..71678238885 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -274,13 +274,13 @@
// Green Hills Native x86 does not support __int64 keyword
// Neither does mingw32.
#if !defined (ACE_LACKS_LONGLONG_T) && !defined (__MINGW32__)
-#define ACE_INT64_TYPE signed __int64
-#define ACE_UINT64_TYPE unsigned __int64
+#define ACE_INT64_TYPE signed __int64
+#define ACE_UINT64_TYPE unsigned __int64
#endif /* (ghs) */
#if defined (__MINGW32__)
-#define ACE_INT64_TYPE signed long long
-#define ACE_UINT64_TYPE unsigned long long
+#define ACE_INT64_TYPE signed long long
+#define ACE_UINT64_TYPE unsigned long long
#endif
// Optimize ACE_Handle_Set for select().
diff --git a/ACE/ace/config-win32-interix.h b/ACE/ace/config-win32-interix.h
index 95513020e33..b411a908fc8 100644
--- a/ACE/ace/config-win32-interix.h
+++ b/ACE/ace/config-win32-interix.h
@@ -30,7 +30,7 @@
#include "ace/config-g++-common.h"
-#define ACE_HAS_NEW_NOTHROW // Need to know 'new's failure semantics.
+#define ACE_HAS_NEW_NOTHROW // Need to know 'new's failure semantics.
#if defined (ACE_HAS_THREADS)
#define ACE_HAS_THREADS