From 0417d27f464f8749e4861c905adfa62e33c61c53 Mon Sep 17 00:00:00 2001
From: George Bosilca <bosilca@icl.utk.edu>
Date: Tue, 22 Aug 2006 14:58:31 +0000
Subject: [PATCH] orte_std_cntr_t vs. size_t round 2. Advantage for size_t ...

This commit was SVN r11317.
---
 ompi/mca/pml/base/pml_base_module_exchange.c | 2 +-
 orte/dss/dss_pack.c                          | 6 +++---
 orte/dss/dss_unpack.c                        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ompi/mca/pml/base/pml_base_module_exchange.c b/ompi/mca/pml/base/pml_base_module_exchange.c
index 48e42aa53f..776093b454 100644
--- a/ompi/mca/pml/base/pml_base_module_exchange.c
+++ b/ompi/mca/pml/base/pml_base_module_exchange.c
@@ -339,7 +339,7 @@ static void mca_pml_base_modex_registry_callback(
                         }
                         cnt = 1;
                         if (ORTE_SUCCESS != (rc = orte_dss.unpack(&buffer,
-                            &num_bytes, &cnt, ORTE_SIZE))) {
+                            &num_bytes, &cnt, ORTE_STD_CNTR))) {
                             ORTE_ERROR_LOG(rc);
                             continue;
                         }
diff --git a/orte/dss/dss_pack.c b/orte/dss/dss_pack.c
index ef1623afe1..d8b1f22af1 100644
--- a/orte/dss/dss_pack.c
+++ b/orte/dss/dss_pack.c
@@ -320,13 +320,13 @@ int orte_dss_pack_string(orte_buffer_t *buffer, void *src,
     for (i = 0; i < num_vals; ++i) {
         if (NULL == ssrc[i]) {  /* got zero-length string/NULL pointer - store NULL */
             len = 0;
-            if (ORTE_SUCCESS != (ret = orte_dss_pack_sizet(buffer, &len, 1, ORTE_SIZE))) {
+            if (ORTE_SUCCESS != (ret = orte_dss_pack_std_cntr(buffer, &len, 1, ORTE_STD_CNTR))) {
                 ORTE_ERROR_LOG(ret);
                 return ret;
             }
         } else {
             len = strlen(ssrc[i]) + 1;
-            if (ORTE_SUCCESS != (ret = orte_dss_pack_sizet(buffer, &len, 1, ORTE_SIZE))) {
+            if (ORTE_SUCCESS != (ret = orte_dss_pack_std_cntr(buffer, &len, 1, ORTE_STD_CNTR))) {
                 ORTE_ERROR_LOG(ret);
                 return ret;
             }
@@ -447,7 +447,7 @@ int orte_dss_pack_byte_object(orte_buffer_t *buffer, void *src, orte_std_cntr_t
 
     for (i = 0; i < num; ++i) {
         n = sbyteptr[i]->size;
-        if (ORTE_SUCCESS != (ret = orte_dss_pack_sizet(buffer, &n, 1, ORTE_SIZE))) {
+        if (ORTE_SUCCESS != (ret = orte_dss_pack_std_cntr(buffer, &n, 1, ORTE_STD_CNTR))) {
             ORTE_ERROR_LOG(ret);
             return ret;
         }
diff --git a/orte/dss/dss_unpack.c b/orte/dss/dss_unpack.c
index ea25638a64..bb89719349 100644
--- a/orte/dss/dss_unpack.c
+++ b/orte/dss/dss_unpack.c
@@ -492,7 +492,7 @@ int orte_dss_unpack_string(orte_buffer_t *buffer, void *dest,
     char **sdest = (char**) dest;
 
     for (i = 0; i < (*num_vals); ++i) {
-        if (ORTE_SUCCESS != (ret = orte_dss_unpack_sizet(buffer, &len, &n, ORTE_SIZE))) {
+        if (ORTE_SUCCESS != (ret = orte_dss_unpack_std_cntr(buffer, &len, &n, ORTE_STD_CNTR))) {
             ORTE_ERROR_LOG(ret);
             return ret;
         }
@@ -732,7 +732,7 @@ int orte_dss_unpack_byte_object(orte_buffer_t *buffer, void *dest, orte_std_cntr
         }
 
         /* unpack object size in bytes */
-        if (ORTE_SUCCESS != (ret = orte_dss_unpack_sizet(buffer, &(dbyteptr[i]->size), &m, ORTE_SIZE))) {
+        if (ORTE_SUCCESS != (ret = orte_dss_unpack_std_cntr(buffer, &(dbyteptr[i]->size), &m, ORTE_STD_CNTR))) {
             ORTE_ERROR_LOG(ret);
             return ret;
         }