← Back to branch summary

~ps-jenkins/unity-scopes-api/ubuntu-vivid-proposed

~ps-jenkins/unity-scopes-api/ubuntu-vivid-proposed

« back to all changes in this revision

Viewing changes to include/unity/scopes/ScopeExceptions.h

Committer: CI bot
Author(s): Marcus Tomlinson, Pete Woods, Pawel Stolowski, Michi Henning
Date: 2014-08-26 13:43:45 UTC
mfrom: (163.295.7 staging)
Revision ID: ps-jenkins@lists.canonical.com-20140826134345-3o2g277ypd8hikj4

Sync with devel
Approved by: PS Jenkins bot

files added:
src/scopes/internal/smartscopes/SmartScope.cpp

files modified:
debian/changelog

debian/tests/scopebuild

debian/tests/scopetest.cpp

include/unity/scopes/ScopeExceptions.h

include/unity/scopes/internal/smartscopes/SSQueryObject.h

include/unity/scopes/internal/smartscopes/SSRegistryObject.h

include/unity/scopes/internal/smartscopes/SSScopeObject.h

include/unity/scopes/internal/smartscopes/SmartScope.h

scoperunner/scoperunner.cpp

src/scopes/ScopeExceptions.cpp

src/scopes/internal/DynamicLoader.cpp

src/scopes/internal/JsonCppNode.cpp

src/scopes/internal/ScopeMetadataImpl.cpp

src/scopes/internal/SettingsDB.cpp

src/scopes/internal/smartscopes/CMakeLists.txt

src/scopes/internal/smartscopes/HttpClientQtThread.cpp

src/scopes/internal/smartscopes/SSQueryObject.cpp

src/scopes/internal/smartscopes/SSRegistryObject.cpp

src/scopes/internal/smartscopes/SSScopeObject.cpp

src/scopes/internal/zmq_middleware/Util.cpp

src/scopes/internal/zmq_middleware/ZmqException.cpp

src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp

Show diffs side-by-side

added added

removed removed

include/unity/scopes/ScopeExceptions.h

83

83

//@}

84

84

85

85

/// @cond

86

virtual ~ObjectNotExistException() noexcept;

86

virtual ~ObjectNotExistException();

87

87

/// @endcond

88

88

89

89

/**

124

124

//@}

125

125

126

126

/// @cond

127

virtual ~TimeoutException() noexcept;

127

virtual ~TimeoutException();

128

128

/// @endcond

129

129

130

130

/**

Older »