diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2011-12-15 14:03:01 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-12-16 21:20:08 +0100 |
| commit | f958657cc5a179a2bccff06f88cd36f80b779184 (patch) | |
| tree | e5d9eda71d9a2add0c1576ca36a1d5d2b778446a /jvmfwk/plugins | |
| parent | bacafe9a07cb2af737b99641efc9cddf55340837 (diff) | |
gcc-trunk: fix error: unable to find string literal operator 'operator"" FOO'
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 8 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 0af05d923087..892e88f7fa75 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -637,7 +637,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( sRuntimeLib, osl_getThreadTextEncoding()); rtl::OString sSymbol = rtl::OUStringToOString( sSymbolCreateJava, osl_getThreadTextEncoding()); - fprintf(stderr,"[Java framework]sunjavaplugin"SAL_DLLEXTENSION + fprintf(stderr,"[Java framework]sunjavaplugin" SAL_DLLEXTENSION "Java runtime library: %s does not export symbol %s !\n", sLib.getStr(), sSymbol.getStr()); return JFW_PLUGIN_E_VM_CREATION_FAILED; @@ -741,13 +741,13 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( rtl::OUString message; if( err < 0) { - fprintf(stderr,"[Java framework] sunjavaplugin"SAL_DLLEXTENSION + fprintf(stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION "Can not create Java Virtual Machine\n"); errcode = JFW_PLUGIN_E_VM_CREATION_FAILED; } else if( err > 0) { - fprintf(stderr,"[Java framework] sunjavaplugin"SAL_DLLEXTENSION + fprintf(stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION "Can not create JavaVirtualMachine, abort handler was called.\n"); errcode = JFW_PLUGIN_E_VM_CREATION_FAILED; } @@ -755,7 +755,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( else { *ppVm = pJavaVM; - JFW_TRACE2("[Java framework] sunjavaplugin"SAL_DLLEXTENSION " has created a VM.\n"); + JFW_TRACE2("[Java framework] sunjavaplugin" SAL_DLLEXTENSION " has created a VM.\n"); } #else (void) arOptions; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index 015a8a23d655..52bd4510ccc2 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -107,7 +107,7 @@ int SunInfo::compareVersions(const rtl::OUString& sSecond) const 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 JRE.")); SunVersion version2(sSecond); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 34c82c1ade87..947022f04aea 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -882,7 +882,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; @@ -933,7 +933,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")); @@ -1029,7 +1029,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")); |