epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

clang port

Browse Source
This commit is contained in:
Matej Sekoranja
2014-08-13 23:49:18 +02:00
parent 5d8c723227
commit 85db68a1ea
17 changed files with 199 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ca/caProvider.cpp
View File

@@ -173,7 +173,9 @@ public:
if (!sharedProvider.get())
{
try {
sharedProvider.reset(new CAChannelProvider());
// TODO use std::make_shared
std::tr1::shared_ptr<CAChannelProvider> tp(new CAChannelProvider());
sharedProvider = tp;
} catch (std::exception &e) {
LOG(logLevelError, "Unhandled exception caught at %s:%d: %s", __FILE__, __LINE__, e.what());
} catch (...) {
@@ -186,7 +188,10 @@ public:
virtual ChannelProvider::shared_pointer newInstance()
{
try {
return ChannelProvider::shared_pointer(new CAChannelProvider());
// TODO use std::make_shared
std::tr1::shared_ptr<CAChannelProvider> tp(new CAChannelProvider());
ChannelProvider::shared_pointer ni = tp;
return ni;
} catch (std::exception &e) {
LOG(logLevelError, "Unhandled exception caught at %s:%d: %s", __FILE__, __LINE__, e.what());
return ChannelProvider::shared_pointer();