diff options
| author | Ismail Donmez <ismail@i10z.com> | 2016-01-26 08:24:57 +0000 |
|---|---|---|
| committer | Ismail Donmez <ismail@i10z.com> | 2016-01-26 08:24:57 +0000 |
| commit | c9655d9bd5c6053af394c23701977a42d50209cc (patch) | |
| tree | b3c73e5e4d0ca3ad2c5713ef863e2bfd88184e89 /openmp/runtime/src | |
| parent | 231b5e23c5d8b05ff564d923358abc3888166158 (diff) | |
| download | bcm5719-llvm-c9655d9bd5c6053af394c23701977a42d50209cc.tar.gz bcm5719-llvm-c9655d9bd5c6053af394c23701977a42d50209cc.zip | |
Fix compilations with msvc's /Zc:strictStrings
llvm-svn: 258797
Diffstat (limited to 'openmp/runtime/src')
| -rw-r--r-- | openmp/runtime/src/kmp_settings.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openmp/runtime/src/kmp_settings.c b/openmp/runtime/src/kmp_settings.c index 067574f242c..af7d7fb238f 100644 --- a/openmp/runtime/src/kmp_settings.c +++ b/openmp/runtime/src/kmp_settings.c @@ -5252,7 +5252,7 @@ __kmp_env_initialize( char const * string ) { else if ( ( __kmp_affinity_gran != affinity_gran_group ) && ( __kmp_affinity_gran != affinity_gran_fine ) && ( __kmp_affinity_gran != affinity_gran_thread ) ) { - char *str = NULL; + const char *str = NULL; switch ( __kmp_affinity_gran ) { case affinity_gran_core: str = "core"; break; case affinity_gran_package: str = "package"; break; @@ -5268,7 +5268,7 @@ __kmp_env_initialize( char const * string ) { __kmp_affinity_gran = affinity_gran_core; } else if ( __kmp_affinity_gran == affinity_gran_group ) { - char *str = NULL; + const char *str = NULL; switch ( __kmp_affinity_type ) { case affinity_physical: str = "physical"; break; case affinity_logical: str = "logical"; break; |
