Minor changes to make gcc 8.1 happy

UO-OACISS · May 26, 2018 · 799c885 · 799c885
1 parent a2d0030
commit 799c885
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/apex/apex.cpp b/src/apex/apex.cpp
@@ -640,7 +640,7 @@ profiler* resume(const std::string &timer_name) {
             for (unsigned int i = 0 ; i < instance->listeners.size() ; i++) {
                 instance->listeners[i]->on_resume(tt_ptr);
             }
-        } catch (disabled_profiler_exception e) { 
+        } catch (disabled_profiler_exception &e) { 
             APEX_UTIL_REF_COUNT_FAILED_RESUME
             return profiler::get_disabled_profiler(); 
         }
@@ -681,7 +681,7 @@ profiler* resume(const apex_function_address function_address) {
             for (unsigned int i = 0 ; i < instance->listeners.size() ; i++) {
                 instance->listeners[i]->on_resume(tt_ptr);
             }
-        } catch (disabled_profiler_exception e) { 
+        } catch (disabled_profiler_exception &e) { 
             APEX_UTIL_REF_COUNT_FAILED_RESUME
             return profiler::get_disabled_profiler(); 
         }
@@ -719,7 +719,7 @@ profiler* resume(profiler * p) {
             for (unsigned int i = 1 ; i < instance->listeners.size() ; i++) {
                 instance->listeners[i]->on_resume(p->tt_ptr);
             }
-        } catch (disabled_profiler_exception e) { 
+        } catch (disabled_profiler_exception &e) { 
             APEX_UTIL_REF_COUNT_FAILED_RESUME
             return profiler::get_disabled_profiler(); 
         }
@@ -1837,7 +1837,7 @@ extern "C" {
 
 } // extern "C"
 
-#ifdef APEX_HAVE_HPX
+#ifdef APEX_HAVE_HPX_disabled
 HPX_DECLARE_ACTION(APEX_TOP_LEVEL_PACKAGE::finalize, apex_internal_shutdown_action);
 HPX_ACTION_HAS_CRITICAL_PRIORITY(apex_internal_shutdown_action);
 HPX_PLAIN_ACTION(APEX_TOP_LEVEL_PACKAGE::finalize, apex_internal_shutdown_action);

diff --git a/src/apex/apex_options.cpp b/src/apex/apex_options.cpp
@@ -53,11 +53,11 @@ namespace apex
 #define apex_macro(name, member_variable, type, default_value) \
     option = getenv(#name); \
     if (option == NULL) { \
-        int length = strlen(default_value) + 1; \
+        size_t length = strlen(default_value) + 1; \
         _##member_variable = (type)(calloc(length, sizeof(char))); \
         strncpy(_##member_variable, default_value, length); \
     } else { \
-        int length = strlen(option) + 1; \
+        size_t length = strlen(option) + 1; \
         _##member_variable = (type)(calloc(length, sizeof(char))); \
         strncpy(_##member_variable, option, length); \
     }
@@ -68,11 +68,11 @@ namespace apex
     type _##member_variable; /* declare the local variable */ \
     option = getenv(#name); \
     if (option == NULL) { \
-        int length = strlen(default_value) + 1; \
+        size_t length = strlen(default_value) + 1; \
         _##member_variable = (type)(calloc(length, sizeof(char))); \
         strncpy(_##member_variable, default_value, length); \
     } else { \
-        int length = strlen(option) + 1; \
+        size_t length = strlen(option) + 1; \
         _##member_variable = (type)(calloc(length, sizeof(char))); \
         strncpy(_##member_variable, option, length); \
     }