Fixes for C++ compatibility

[frescor/frsh-include.git] / frsh_opaque_types.h

diff --git a/frsh_opaque_types.h b/frsh_opaque_types.h
index 4d21bf05be7244995b6a99cb7b602eca3340f9e3..55e802c58d90c9873eea78d8ac5a354a8bc0556b 100644 (file)
--- a/frsh_opaque_types.h
+++ b/frsh_opaque_types.h
@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-//  Copyright (C) 2006 - 2008 FRESCOR consortium partners:
+//  Copyright (C) 2006 - 2009 FRESCOR consortium partners:
 //
 //    Universidad de Cantabria,              SPAIN
 //    University of York,                    UK
@@ -51,12 +51,6 @@
 //  by the GNU General Public License. This exception does not
 //  however invalidate any other reasons why the executable file might be
 //  covered by the GNU Public License.
-//  As a special exception, if you include this header file into source
-//  files to be compiled, this header file does not by itself cause
-//  the resulting executable to be covered by the GNU General Public
-//  License.  This exception does not however invalidate any other
-//  reasons why the executable file might be covered by the GNU General
-//  Public License.
 // -----------------------------------------------------------------------
 //frsh_opaque_types.h
 //==============================================
@@ -67,7 +61,7 @@
 //  **////  /**///**  ////////** /**//////**
 //  **      /**  //**        /** /**     /**
 //  **      /**   //** ********  /**     /**
-//  //       //     // ////////   //      // 
+//  //       //     // ////////   //      //
 //
 // FRSH(FRescor ScHeduler), pronounced "fresh"
 //==============================================
@@ -97,6 +91,8 @@ FRSH_CPP_BEGIN_DECLS
  * @{
  **/
 
+#define FRSH_VRES_ID_T_OPAQUE unsigned int
+
 /** frsh_contract_parameters_t **/
 #define FRSH_CONTRACT_T_OPAQUE struct { \
 \
@@ -110,7 +106,7 @@ FRSH_CPP_BEGIN_DECLS
      Unique within the local node               **/         \
   frsh_contract_label_t      contract_label;                        \
 \
-  /** Minimum budget needed to perform a job.  With the energy 
+  /** Minimum budget needed to perform a job.  With the energy
       module this will be an array **/              \
   frsh_rel_time_t         budget_min;                         \
 \
@@ -191,7 +187,7 @@ FRSH_CPP_BEGIN_DECLS
   frsh_endpoint_queueing_info_t    queueing_info; \
 \
   /** Maximum loss rate
-      Percentage of packet loss in the network that is 
+      Percentage of packet loss in the network that is
       tolerated by the application **/                       \
 int                     max_loss_rate; \
 \
@@ -207,6 +203,8 @@ typedef int FRSH_SYNCHOBJ_HANDLE_T_OPAQUE;
 
 typedef int FRSH_SHAREDOBJ_HANDLE_T_OPAQUE;
 
+typedef unsigned int FRSH_GROUP_ID_T_OPAQUE;
+
 /**
  * Critical section data
  * - comon parameters
@@ -218,7 +216,7 @@ typedef int FRSH_SHAREDOBJ_HANDLE_T_OPAQUE;
  *     op;          // pointer to the operation
  * - attributes used only for protected write operations
  *     areas;       // memory areas to be protected
- * 
+ *
  **/
 #define FRSH_CSECT_T_OPAQUE struct { \
   frsh_csect_op_kind_t op_kind;                 \