Wed Nov 1 18:58:45 UTC 2006 Nishanth Shankaran <nshankar@nospan.com>

5 files changed, 35 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 1e582572fd7..2ed3b56a56f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Nov  1 18:58:45 UTC 2006  Nishanth Shankaran  <nshankar@nospan.com>
+
+        * SA_POP/Converter.h:
+        * SA_POP/SANet/SANetFileIn.h:
+        * SA_POP/SA_POP.mpc:
+        * common/OpString.idl:
+
+        Fixed compilation errors and warnings on linux.
+
 Wed Nov  1 17:07:41 UTC 2006  Nishanth Shankaran  <nshankar@nospam.com>
 
         * SA_POP/Converter.cpp:
diff --git a/SA_POP/Converter.h b/SA_POP/Converter.h
index bb150884cd1..567884dc2b9 100644
--- a/SA_POP/Converter.h
+++ b/SA_POP/Converter.h
@@ -3,7 +3,7 @@
 #include "ace/SString.h"
 #include "orbsvcs/CosNamingC.h"
 #include "RACE/common/OpStringC.h"
-#include "Plan_Generator_impl.h"
+#include "Plan_Generator_Impl.h"
 namespace CIAO
 {
   namespace RACE
diff --git a/SA_POP/SANet/SANetFileIn.h b/SA_POP/SANet/SANetFileIn.h
index 97e019644e0..4e27d05840d 100644
--- a/SA_POP/SANet/SANetFileIn.h
+++ b/SA_POP/SANet/SANetFileIn.h
@@ -39,7 +39,7 @@ namespace SANet {
     virtual ~SANetFileIn (void);
 
     /// Buffer size for string conversion.
-    const static size_t STR_BUF_SIZE = 129;
+    static const size_t STR_BUF_SIZE = 129;
 
     /// Create network from XML file.
     /**
diff --git a/SA_POP/SA_POP.mpc b/SA_POP/SA_POP.mpc
index 2b6f26701bd..0f8690e0c47 100644
--- a/SA_POP/SA_POP.mpc
+++ b/SA_POP/SA_POP.mpc
@@ -1,7 +1,14 @@
-project(SA_POP_Driver) : ciao_component_dnc, ciao_race_component, taoexe, ciao_plan_generator, ciao_config_handlers, xerces {
+project(SA_POP_Driver) : ciao_component_dnc, ciao_race_component, \
+                         taoexe, ciao_plan_generator, \
+                         ciao_config_handlers, xerces {
+
    after += Interactive_Input_Adapter_stub OpString_stub XSC_Config_Handlers
    exename = driver
-   includes += $(CIAO_ROOT)/RACE/Input_Adapters/Interactive_Input_Adapter $(CIAO_ROOT)/tools/Config_Handlers $(CIAO_ROOT)/RACE/SA_POP
+
+   includes += $(CIAO_ROOT)/RACE/Input_Adapters/Interactive_Input_Adapter \
+               $(CIAO_ROOT)/tools/Config_Handlers \
+               $(CIAO_ROOT)/RACE/SA_POP
+
    libs += Interactive_Input_Adapter_stub \
            Input_Adapter_stub \
            Plan_Analyzer_Interface_stub\
diff --git a/common/OpString.idl b/common/OpString.idl
index d0d0822fa0e..89320eef097 100644
--- a/common/OpString.idl
+++ b/common/OpString.idl
@@ -12,9 +12,9 @@ module CIAO
 
       struct TimeValue
       {
-        /* Seconds since Jan. 1, 1970 */
+        // Seconds since Jan. 1, 1970
         long    sec;
-        /* and microseconds */
+        //and microseconds
         long    usec;
       };
 
@@ -87,10 +87,16 @@ module CIAO
         // Type of link.
         ConnectionType type;
 
+        // Identifies ports of task instances external to this operational
+        // string as an endpoint of this link.
         ::Deployment::ComponentExternalPortEndpoints externalEndpoint;
 
+        // Identifies ports of task instances within this operational
+        // string as an endpoint of this link.
         ::Deployment::PlanSubcomponentPortEndpoints internalEndpoint;
 
+        // Identifies a location outside the operational string as an
+        // endpoint of the link.
         ::Deployment::ExternalReferenceEndpoints externalReference;
 
       };
@@ -140,10 +146,10 @@ module CIAO
       struct GoalCondition
       {
         // ID of condition (in Task Network).
-        int condID;
+        long condID;
 
         // Utility value (specifying importance of this goal condition).
-        int utility;
+        long utility;
       };
 
       typedef sequence <GoalCondition> GoalConditions;
@@ -151,15 +157,15 @@ module CIAO
       struct TimeConstraint
       {
         // ID of condition (in Task Network).
-        int condID;
+        long condID;
 
         // Start-by (end-by) time for this data (non-data) condition.
-        TimeValue timeConstraint;
+        TimeValue constraint;
       };
 
       typedef sequence <TimeConstraint> TimeConstraints;
 
-      struct Goal
+      struct GoalStructure
       {
         // Universally unique ID of goal.
         string UUID;
@@ -175,7 +181,7 @@ module CIAO
         TimeConstraints relativeTimeConstraints;
 
         // Start-by and end-by constraints on conditions, in clock time.
-        TimeConstraints absoluteTimeConstraints;
+        TimeConstraints absoluteTimeConstraintns;
 
         // QoS requirements.
         QoSSpecifications QoSRequirements;
@@ -195,7 +201,7 @@ module CIAO
         string name;
 
         // Goal achieved by this opstring.
-        Goal goal;
+        GoalStructure goal;
 
         // Task instances in opstring.
         InstanceDescriptions instances;