Merge pull request #1048 from jsquyres/pr/2.0.0/minor-warnings-fixes

hppritcha · hppritcha · commit e9c8d7432b8e · 2016-03-26T13:22:15.000-06:00
v2.0.0: trivial warnings fixes
diff --git a/ompi/info/info.c b/ompi/info/info.c
@@ -275,7 +275,7 @@ int ompi_info_set (ompi_info_t *info, const char *key, const char *value)
 int ompi_info_set_value_enum (ompi_info_t *info, const char *key, int value,
                               mca_base_var_enum_t *var_enum)
 {
-    char *string_value;
+    const char *string_value;
     int ret;
 
     ret = var_enum->string_from_value (var_enum, value, &string_value);
diff --git a/orte/mca/rmaps/rank_file/rmaps_rank_file.c b/orte/mca/rmaps/rank_file/rmaps_rank_file.c
@@ -216,7 +216,7 @@ static int orte_rmaps_rf_map(orte_job_t *jdata)
                         /* all would be oversubscribed, so take the least loaded one */
                         k = UINT32_MAX;
                         OPAL_LIST_FOREACH(nd, &node_list, orte_node_t) {
-                            if (nd->num_procs < k) {
+                            if (nd->num_procs < (orte_vpid_t)k) {
                                 k = nd->num_procs;
                                 node = nd;
                             }

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ int ompi_info_set (ompi_info_t info, const char key, const char *value)`
`275`	`275`	`int ompi_info_set_value_enum (ompi_info_t info, const char key, int value,`
`276`	`276`	`mca_base_var_enum_t *var_enum)`
`277`	`277`	`{`
`278`		`- char *string_value;`
	`278`	`+ const char *string_value;`
`279`	`279`	`int ret;`
`280`	`280`
`281`	`281`	`ret = var_enum->string_from_value (var_enum, value, &string_value);`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ static int orte_rmaps_rf_map(orte_job_t *jdata)`
`216`	`216`	`/* all would be oversubscribed, so take the least loaded one */`
`217`	`217`	`k = UINT32_MAX;`
`218`	`218`	`OPAL_LIST_FOREACH(nd, &node_list, orte_node_t) {`
`219`		`- if (nd->num_procs < k) {`
	`219`	`+ if (nd->num_procs < (orte_vpid_t)k) {`
`220`	`220`	`k = nd->num_procs;`
`221`	`221`	`node = nd;`
`222`	`222`	`}`