privatee -> privat: variable was called same as c++ keyword

openshmem-org · Jul 25, 2022 · e33a098 · e33a098
1 parent 762c3a1
commit e33a098
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/shmemc/contexts.c b/src/shmemc/contexts.c
@@ -161,7 +161,7 @@ inline static void
 context_set_options(long options, shmemc_context_h ch)
 {
     ch->attr.serialized = options & SHMEM_CTX_SERIALIZED;
-    ch->attr.private    = options & SHMEM_CTX_PRIVATE;
+    ch->attr.privat     = options & SHMEM_CTX_PRIVATE;
     ch->attr.nostore    = options & SHMEM_CTX_NOSTORE;
 }
 

diff --git a/src/shmemc/teams.c b/src/shmemc/teams.c
@@ -357,7 +357,7 @@ shmemc_team_destroy(shmemc_team_h th)
         size_t c;
 
         for (c = 0; c < th->nctxts; ++c) {
-            if (! th->ctxts[c]->attr.private) {
+            if (! th->ctxts[c]->attr.privat) {
                 shmemc_context_destroy(th->ctxts[c]);
             }
         }

diff --git a/src/shmemc/ucx/contexts.c b/src/shmemc/ucx/contexts.c
@@ -30,7 +30,7 @@ shmemc_ucx_context_progress(shmemc_context_h ch)
     if (ch->attr.serialized) {
         wkpm.thread_mode = UCS_THREAD_MODE_SERIALIZED;
     }
-    else if (ch->attr.private) {
+    else if (ch->attr.privat) {
         wkpm.thread_mode = UCS_THREAD_MODE_SINGLE;
     }
     else {

diff --git a/src/shmemc/ucx/pe.h b/src/shmemc/ucx/pe.h
@@ -106,7 +106,7 @@ typedef struct shmemc_team {
  */
 typedef struct shmemc_context_attr {
     bool serialized;
-    bool private;
+    bool privat;                /* "private" is c++ keyword */
     bool nostore;
 } shmemc_context_attr_t;
 

diff --git a/src/shmemu/shmemu.h b/src/shmemu/shmemu.h
@@ -237,7 +237,7 @@ int shmemu_thread_level(const char *tn);
         if (shmemu_likely(ctx != SHMEM_CTX_INVALID)) {                  \
             shmemc_context_h ch = (shmemc_context_h) (_ctx);            \
                                                                         \
-            if (ch->attr.private) {                                     \
+            if (ch->attr.privat) {                                      \
                 const threadwrap_thread_t me = threadwrap_thread_id();  \
                 const threadwrap_thread_t cr = ch->creator_thread;      \
                 const unsigned long ulme = (unsigned long) me;          \