2008-01-31 Joel Sherrill <joel.sherrill@OARcorp.com>

	* score/include/rtems/score/object.h, score/src/objectgetinfo.c,
	rtems/include/rtems/rtems/object.h,
	rtems/src/rtemsobjectgetapiclassname.c,
	rtems/src/rtemsobjectgetclassinfo.c: class is a C++ keyword and
	cannot be used as a parameter.

6 files changed, 34 insertions, 25 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 548992244c..3c655f5c32 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-31	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* score/include/rtems/score/object.h, score/src/objectgetinfo.c,
+	rtems/include/rtems/rtems/object.h,
+	rtems/src/rtemsobjectgetapiclassname.c,
+	rtems/src/rtemsobjectgetclassinfo.c: class is a C++ keyword and
+	cannot be used as a parameter.
+
 2008-01-30	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* score/Makefile.am, score/include/rtems/score/threadq.h,
diff --git a/cpukit/rtems/include/rtems/rtems/object.h b/cpukit/rtems/include/rtems/rtems/object.h
index 6bcab81e8c..bb989df22c 100644
--- a/cpukit/rtems/include/rtems/rtems/object.h
+++ b/cpukit/rtems/include/rtems/rtems/object.h
@@ -20,6 +20,7 @@
 extern "C" {
 #endif
 
+#include <stdint.h>
 #include <rtems/score/object.h>
 #include <rtems/rtems/status.h>
 #include <rtems/rtems/types.h>
@@ -287,26 +288,26 @@ const char *rtems_object_get_api_name(
  *  This method returns a string containing the name of the
  *  @a class from the specified @a api.
  *
- *  @param[in] api is the API for the class
- *  @param[in] class is the class to obtain the name of
+ *  @param[in] the_api is the API for the class
+ *  @param[in] the_class is the class to obtain the name of
  *
  *  @return If successful, this method returns the name of
  *          the specified @a class.  Otherwise, it returns
  *          the string "BAD CLASS"
  */
 const char *rtems_object_get_api_class_name(
-  uint32_t api, 
-  uint32_t class
+  uint32_t the_api, 
+  uint32_t the_class
 );
 
 /**
  *  @brief Get Class Name
  *
  *  This method returns a string containing the name of the
- *  @a class from the specified @a api.
+ *  @a the_class from the specified @a api.
  *
- *  @param[in] api is the API for the class
- *  @param[in] class is the class to obtain information about
+ *  @param[in] the_api is the API for the class
+ *  @param[in] the_class is the class to obtain information about
  *  @param[in] info points to the information structure to fill in
  *
  *  @return If successful, this method returns the name of
@@ -315,8 +316,8 @@ const char *rtems_object_get_api_class_name(
  *
  */
 rtems_status_code rtems_object_get_class_information(
-  uint32_t                            api,
-  uint32_t                            class,
+  uint32_t                            the_api,
+  uint32_t                            the_class,
   rtems_object_api_class_information *info
 );
 
diff --git a/cpukit/rtems/src/rtemsobjectgetapiclassname.c b/cpukit/rtems/src/rtemsobjectgetapiclassname.c
index 9455a9aece..ebf36339d7 100644
--- a/cpukit/rtems/src/rtemsobjectgetapiclassname.c
+++ b/cpukit/rtems/src/rtemsobjectgetapiclassname.c
@@ -70,14 +70,14 @@ rtems_assoc_t rtems_object_api_itron_assoc[] = {
 #endif
 
 const char *rtems_object_get_api_class_name(
-  uint32_t api, 
-  uint32_t class
+  uint32_t the_api, 
+  uint32_t the_class
 )
 {
   const rtems_assoc_t *api_assoc;
   const rtems_assoc_t *class_assoc;
   
-  switch (api) {
+  switch (the_api) {
     case OBJECTS_INTERNAL_API:
       api_assoc = rtems_object_api_internal_assoc;
       break;
@@ -97,7 +97,7 @@ const char *rtems_object_get_api_class_name(
     default:
       return "BAD API";
   }
-  class_assoc = rtems_assoc_ptr_by_local( api_assoc, class );
+  class_assoc = rtems_assoc_ptr_by_local( api_assoc, the_class );
   if ( class_assoc )
     return class_assoc->name;
   return "BAD CLASS";
diff --git a/cpukit/rtems/src/rtemsobjectgetclassinfo.c b/cpukit/rtems/src/rtemsobjectgetclassinfo.c
index ec111c0181..f47846506f 100644
--- a/cpukit/rtems/src/rtemsobjectgetclassinfo.c
+++ b/cpukit/rtems/src/rtemsobjectgetclassinfo.c
@@ -24,8 +24,8 @@
 #include <rtems/rtems/object.h>
 
 rtems_status_code rtems_object_get_class_information(
-  uint32_t                            api,
-  uint32_t                            class,
+  uint32_t                            the_api,
+  uint32_t                            the_class,
   rtems_object_api_class_information *info
 )
 {
@@ -39,7 +39,7 @@ rtems_status_code rtems_object_get_class_information(
   if ( !info )
     return RTEMS_INVALID_ADDRESS;
 
-  obj_info = _Objects_Get_information( api, class );
+  obj_info = _Objects_Get_information( the_api, the_class );
   if ( !obj_info )
     return RTEMS_INVALID_NUMBER;
 
diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/score/include/rtems/score/object.h
index aa3218adc0..7ea986c6ec 100644
--- a/cpukit/score/include/rtems/score/object.h
+++ b/cpukit/score/include/rtems/score/object.h
@@ -803,15 +803,15 @@ Objects_Control *_Objects_Get_next(
  *  an the API and Class.  This can be done independent of
  *  the existence of any objects created by the API.
  *
- *  @param[in] api indicates the API for the information we want
- *  @param[in] class indicates the Class for the information we want
+ *  @param[in] the_api indicates the API for the information we want
+ *  @param[in] the_class indicates the Class for the information we want
  *
  *  @return This method returns a pointer to the Object Information Table
  *          for the class of objects which corresponds to this object ID.
  */
 Objects_Information *_Objects_Get_information(
-  Objects_APIs   api,
-  uint32_t       class
+  Objects_APIs   the_api,
+  uint32_t       the_class
 );
 
 /**
diff --git a/cpukit/score/src/objectgetinfo.c b/cpukit/score/src/objectgetinfo.c
index 4deb7b995e..8697c227e6 100644
--- a/cpukit/score/src/objectgetinfo.c
+++ b/cpukit/score/src/objectgetinfo.c
@@ -19,19 +19,19 @@
 #include <rtems/score/wkspace.h>
 
 Objects_Information *_Objects_Get_information(
-  Objects_APIs   api,
-  uint32_t       class
+  Objects_APIs   the_api,
+  uint32_t       the_class
 )
 {
   Objects_Information *info;
 
-  if ( !_Objects_Is_api_valid( api ) )
+  if ( !_Objects_Is_api_valid( the_api ) )
     return NULL;
 
-  if ( !class || class > _Objects_API_maximum_class(api) )
+  if ( !the_class || the_class > _Objects_API_maximum_class(the_api) )
     return NULL;
 
-  info = _Objects_Information_table[ api ][ class ];
+  info = _Objects_Information_table[ the_api ][ the_class ];
   if ( !info )
     return NULL;