diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-04-13 15:25:28 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-04-13 17:32:43 +0200 |
| commit | 74315cbccf13b578551390762d5efc0a30c2d65b (patch) | |
| tree | 68c4390e825b8eb6225825514a7b13af579ee215 /jvmfwk/plugins | |
| parent | Use std::unique_ptr<JavaInfo> in jfw_plugin_getJavaInfosFromPath (diff) | |
| download | core-74315cbccf13b578551390762d5efc0a30c2d65b.tar.gz core-74315cbccf13b578551390762d5efc0a30c2d65b.zip | |
Use std::unique_ptr<JavaInfo> in jfw_plugin_getJavaInfoFromJavaHome
Change-Id: I8be48d1eec799f347a5edaa67837cf1bbf4d2cc3
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index da7f6218d0d3..f336532f3515 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -386,7 +386,8 @@ javaPluginError jfw_plugin_getJavaInfoByPath( javaPluginError jfw_plugin_getJavaInfoFromJavaHome( std::vector<pair<OUString, jfw::VersionInfo>> const& vecVendorInfos, - JavaInfo ** ppInfo, std::vector<rtl::Reference<VendorBase>> & infos) + std::unique_ptr<JavaInfo> * ppInfo, + std::vector<rtl::Reference<VendorBase>> & infos) { assert(ppInfo); @@ -414,7 +415,7 @@ javaPluginError jfw_plugin_getJavaInfoFromJavaHome( if (errorcode == javaPluginError::NONE) { - *ppInfo = createJavaInfo(infoJavaHome[0]); + ppInfo->reset(createJavaInfo(infoJavaHome[0])); return javaPluginError::NONE; } } |