[Openmp-commits] [openmp] r230035 - Two warning messages fixed.
Andrey Churbanov
Andrey.Churbanov at intel.com
Fri Feb 20 10:19:42 PST 2015
Author: achurbanov
Date: Fri Feb 20 12:19:41 2015
New Revision: 230035
URL: http://llvm.org/viewvc/llvm-project?rev=230035&view=rev
Log:
Two warning messages fixed.
Modified:
openmp/trunk/runtime/src/i18n/en_US.txt
openmp/trunk/runtime/src/kmp_lock.cpp
openmp/trunk/runtime/src/kmp_settings.c
Modified: openmp/trunk/runtime/src/i18n/en_US.txt
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/i18n/en_US.txt?rev=230035&r1=230034&r2=230035&view=diff
==============================================================================
--- openmp/trunk/runtime/src/i18n/en_US.txt (original)
+++ openmp/trunk/runtime/src/i18n/en_US.txt Fri Feb 20 12:19:41 2015
@@ -322,8 +322,8 @@ BarriersInDifferentOrder "Threads en
FunctionError "Function %1$s failed:"
TopologyExtra "%1$s: %2$s packages x %3$d cores/pkg x %4$d threads/core (%5$d total cores)"
WrongMessageCatalog "Incompatible message catalog \"%1$s\": Version \"%2$s\" found, version \"%3$s\" expected."
-StgIgnored "%1$s: ignored because %3$s has been defined"
- # %1, %2 -- name and value of ignored variable, %3 -- name of variable with higher priority.
+StgIgnored "%1$s: ignored because %2$s has been defined"
+ # %1, -- name of ignored variable, %2 -- name of variable with higher priority.
OBSOLETE "%1$s: overrides %3$s specified before"
# %1, %2 -- name and value of the overriding variable, %3 -- name of overriden variable.
@@ -367,8 +367,8 @@ IncompatibleLibrary "Incompatib
IttFunctionError "ittnotify: Function %1$s failed:"
IttUnknownError "ittnofify: Error #%1$d."
EnvMiddleWarn "%1$s must be set prior to first parallel region or certain API calls; ignored."
-CnsLockNotDestroyed "Lock initialized at %1$s(%3$d) was not destroyed"
- # %1, %2, %3, %4 -- file, func, line, col
+CnsLockNotDestroyed "Lock initialized at %1$s(%2$d) was not destroyed"
+ # %1, %2, %3, %4 -- file, line, func, col
CantLoadBalUsing "Cannot determine machine load balance - Using %1$s"
AffNotCapableUsePthread "%1$s: Affinity not capable, using pthread info"
AffUsePthread "%1$s: Affinity capable, using pthread info"
Modified: openmp/trunk/runtime/src/kmp_lock.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_lock.cpp?rev=230035&r1=230034&r2=230035&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_lock.cpp (original)
+++ openmp/trunk/runtime/src/kmp_lock.cpp Fri Feb 20 12:19:41 2015
@@ -4043,8 +4043,7 @@ __kmp_cleanup_user_locks( void )
( ( loc = __kmp_get_user_lock_location( lck ) ) != NULL ) &&
( loc->psource != NULL ) ) {
kmp_str_loc_t str_loc = __kmp_str_loc_init( loc->psource, 0 );
- KMP_WARNING( CnsLockNotDestroyed, str_loc.file, str_loc.func,
- str_loc.line, str_loc.col );
+ KMP_WARNING( CnsLockNotDestroyed, str_loc.file, str_loc.line );
__kmp_str_loc_free( &str_loc);
}
Modified: openmp/trunk/runtime/src/kmp_settings.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_settings.c?rev=230035&r1=230034&r2=230035&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_settings.c (original)
+++ openmp/trunk/runtime/src/kmp_settings.c Fri Feb 20 12:19:41 2015
@@ -4862,7 +4862,7 @@ __kmp_stg_check_rivals( // 0 --
#endif
if ( rivals[ i ]->set ) {
- KMP_WARNING( StgIgnored, name, value, rivals[ i ]->name );
+ KMP_WARNING( StgIgnored, name, rivals[ i ]->name );
return 1;
}; // if
}; // while
More information about the Openmp-commits
mailing list