diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-11-29 14:39:04 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2013-11-29 14:39:04 +0000 |
| commit | 912bfc3843c054c4af90ffe4a7065eb9a8face6e (patch) | |
| tree | 4de5751d996639b3aea944077c75845b6cc6c60c /jvmfwk | |
| parent | def161ea3c010d91f8ff325e4e258fcc8d15352c (diff) | |
#i123773# fix ambiguity between string concatenation and C++ user-defined literals
C++11 conformant compilers such as clang rejects string concatenations
that are ambigous with the C++11 feature "user-defined literals" (N2378)
Notes
Notes:
prefer: fcc8db1d2be9a25f79cbcc14043b495d240bb8bf
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index cf816fd1bed4..1c8fa981b691 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -105,7 +105,7 @@ int SunInfo::compareVersions(const rtl::OUString& sSecond) const rtl::OUString sFirst = getVersion(); SunVersion version1(sFirst); - JFW_ENSURE(version1, OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION + JFW_ENSURE(version1, OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION " does not know the version: ") + sFirst + OUSTR(" as valid for a SUN/Oracle JRE.")); SunVersion version2(sSecond); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 57c19ee78fc5..6520d3e8a0c5 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -879,7 +879,7 @@ rtl::Reference<VendorBase> getJREInfoByPath( SameOrSubDirJREMap(sResolvedDir)); if (entry2 != mapJREs.end()) { - JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION ": ") + JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ": ") + OUSTR("JRE found again (detected before): ") + sResolvedDir + OUSTR(".\n")); return entry2->second; @@ -930,7 +930,7 @@ rtl::Reference<VendorBase> getJREInfoByPath( MapIt entry = mapJREs.find(sFilePath); if (entry != mapJREs.end()) { - JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION ": ") + JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ": ") + OUSTR("JRE found again (detected before): ") + sFilePath + OUSTR(".\n")); @@ -1018,7 +1018,7 @@ rtl::Reference<VendorBase> getJREInfoByPath( vecBadPaths.push_back(sFilePath); else { - JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION ": ") + JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ": ") + OUSTR("Found JRE: ") + sResolvedDir + OUSTR(" \n at: ") + path + OUSTR(".\n")); |