← Back to branch summary

~stolowski/unity-scopes-api/fix-user-agent-in-preview-rtm

~stolowski/unity-scopes-api/fix-user-agent-in-preview-rtm

« back to all changes in this revision

Viewing changes to src/scopes/Variant.cpp

Committer: Pawel Stolowski
Date: 2014-11-04 14:33:07 UTC
mfrom: (241.1.20 unity-scopes-api)
Revision ID: pawel.stolowski@canonical.com-20141104143307-cs70gjyowjtwpk69

Merged trunk.

files added:
include/unity/scopes/OnlineAccountClient.h

include/unity/scopes/internal/OnlineAccountClientImpl.h

src/scopes/OnlineAccountClient.cpp

src/scopes/internal/OnlineAccountClientImpl.cpp

src/scopes/internal/smartscopes/SmartScope.cpp

test/abi-compliance

test/abi-compliance/CMakeLists.txt

test/abi-compliance/abi.xml.in

test/gtest/scopes/OnlineAccountClient

test/gtest/scopes/OnlineAccountClient/CMakeLists.txt

test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp

test/gtest/scopes/OnlineAccountClient/data

test/gtest/scopes/OnlineAccountClient/data/TestService.service

test/gtest/scopes/internal/RuntimeImpl/TestScope_TestScope.ini.in

test/gtest/scopes/internal/zmq_middleware/ConnectionPool

test/gtest/scopes/internal/zmq_middleware/ConnectionPool/CMakeLists.txt

test/gtest/scopes/internal/zmq_middleware/ConnectionPool/ConnectionPool_test.cpp

tools/symbol_diff.in

files removed:
include/unity/scopes/internal/max_align_clang_bug.h

files modified:
CMakeLists.txt

HACKING

RELEASE_NOTES.md

STRUCTS

debian/changelog

debian/control

debian/libunity-scopes3.symbols

debian/tests/scopebuild

debian/tests/scopetest.cpp

demo/client.cpp

demo/scopes/scope-A/scope-A.cpp

doc/tutorial.dox

include/unity/scopes/ActionMetadata.h

include/unity/scopes/PreviewWidget.h

include/unity/scopes/ScopeBase.h

include/unity/scopes/ScopeExceptions.h

include/unity/scopes/SearchQueryBase.h

include/unity/scopes/internal/LocationImpl.h

include/unity/scopes/internal/PreviewWidgetImpl.h

include/unity/scopes/internal/QueryMetadataImpl.h

include/unity/scopes/internal/Reaper.h

include/unity/scopes/internal/RegistryObject.h

include/unity/scopes/internal/SearchMetadataImpl.h

include/unity/scopes/internal/ThreadPool.h

include/unity/scopes/internal/Utils.h

include/unity/scopes/internal/lttng/SimpleTracepoint.h

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

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

include/unity/scopes/internal/smartscopes/HttpClientQtThread.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

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

include/unity/scopes/internal/zmq_middleware/ConnectionPool.h

include/unity/scopes/internal/zmq_middleware/ObjectAdapter.h

include/unity/scopes/internal/zmq_middleware/StopPublisher.h

include/unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h

include/unity/scopes/internal/zmq_middleware/ZmqScope.h

include/unity/scopes/internal/zmq_middleware/ZmqSender.h

include/unity/scopes/testing/TypedScopeFixture.h

scoperegistry/FindFiles.cpp

scoperegistry/ScopesWatcher.cpp

scoperegistry/scoperegistry.cpp

scoperunner/scoperunner.cpp

src/scopes/ActionMetadata.cpp

src/scopes/CMakeLists.txt

src/scopes/PreviewWidget.cpp

src/scopes/ScopeExceptions.cpp

src/scopes/Variant.cpp

src/scopes/internal/CMakeLists.txt

src/scopes/internal/CannedQueryImpl.cpp

src/scopes/internal/ConfigBase.cpp

src/scopes/internal/DynamicLoader.cpp

src/scopes/internal/JsonCppNode.cpp

src/scopes/internal/JsonSettingsSchema.cpp

src/scopes/internal/PreviewWidgetImpl.cpp

src/scopes/internal/QueryMetadataImpl.cpp

src/scopes/internal/Reaper.cpp

src/scopes/internal/RegistryObject.cpp

src/scopes/internal/ReplyObject.cpp

src/scopes/internal/RuntimeImpl.cpp

src/scopes/internal/ScopeMetadataImpl.cpp

src/scopes/internal/SearchMetadataImpl.cpp

src/scopes/internal/SettingsDB.cpp

src/scopes/internal/ThreadPool.cpp

src/scopes/internal/Utils.cpp

src/scopes/internal/smartscopes/CMakeLists.txt

src/scopes/internal/smartscopes/HttpClientQt.cpp

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/smartscopes/SmartScopesClient.cpp

src/scopes/internal/zmq_middleware/ConnectionPool.cpp

src/scopes/internal/zmq_middleware/ObjectAdapter.cpp

src/scopes/internal/zmq_middleware/StopPublisher.cpp

src/scopes/internal/zmq_middleware/Util.cpp

src/scopes/internal/zmq_middleware/ZmqException.cpp

src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp

src/scopes/internal/zmq_middleware/ZmqObject.cpp

src/scopes/internal/zmq_middleware/ZmqPublisher.cpp

src/scopes/internal/zmq_middleware/ZmqRegistry.cpp

src/scopes/internal/zmq_middleware/ZmqScope.cpp

src/scopes/internal/zmq_middleware/ZmqSender.cpp

src/scopes/internal/zmq_middleware/ZmqSubscriber.cpp

src/scopes/testing/Benchmark.cpp

src/scopes/testing/InProcessBenchmark.cpp

src/scopes/testing/Statistics.cpp

src/scopes/testing/TypedScopeFixture.cpp

test/CMakeLists.txt

test/gtest/scopes/Activation/Activation_test.cpp

test/gtest/scopes/Activation/CMakeLists.txt

test/gtest/scopes/Activation/Registry.ini.in

test/gtest/scopes/Activation/Runtime.ini.in

test/gtest/scopes/CMakeLists.txt

test/gtest/scopes/CannedQuery/CannedQuery_test.cpp

test/gtest/scopes/Filters/CMakeLists.txt

test/gtest/scopes/Filters/Filters_test.cpp

test/gtest/scopes/Filters/Registry.ini.in

test/gtest/scopes/Filters/Runtime.ini.in

test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp

test/gtest/scopes/Invocation/Invocation_test.cpp

test/gtest/scopes/PreviewWidget/PreviewWidget_test.cpp

test/gtest/scopes/QueryMetadata/QueryMetadata_test.cpp

test/gtest/scopes/Registry/CMakeLists.txt

test/gtest/scopes/Registry/Registry_test.cpp

test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.cpp

test/gtest/scopes/ReplyReaper/ReplyReaper_test.cpp

test/gtest/scopes/Runtime/Runtime_test.cpp

test/gtest/scopes/Runtime/SlowCreateScope.cpp

test/gtest/scopes/Variant/Variant_test.cpp

test/gtest/scopes/internal/DynamicLoader/DynamicLoader_test.cpp

test/gtest/scopes/internal/IniSettingsSchema/IniSettingsSchema_test.cpp

test/gtest/scopes/internal/Reaper/Reaper_test.cpp

test/gtest/scopes/internal/RegistryConfig/RegistryConfig_test.cpp

test/gtest/scopes/internal/RuntimeImpl/CMakeLists.txt

test/gtest/scopes/internal/RuntimeImpl/RuntimeImpl_test.cpp

test/gtest/scopes/internal/RuntimeImpl/TestScope.ini.in

test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp

test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp

test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp

test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp

test/gtest/scopes/internal/ThreadPool/ThreadPool_test.cpp

test/gtest/scopes/internal/ThreadSafeQueue/ThreadSafeQueue_test.cpp

test/gtest/scopes/internal/smartscopes/HttpClient/HttpClient_test.cpp

test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py

test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp

test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp

test/gtest/scopes/internal/zmq_middleware/CMakeLists.txt

test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/ObjectAdapter_test.cpp

test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp

test/gtest/scopes/internal/zmq_middleware/Util/Util_test.cpp

test/gtest/scopes/testing/Statistics/Statistics_test.cpp

test/headers/compile_headers.py

tools/CMakeLists.txt

valgrind-suppress

Show diffs side-by-side

added added

removed removed

src/scopes/Variant.cpp

21

21

22

22

#include <unity/UnityExceptions.h>

23

23

24

#include <unity/scopes/internal/max_align_clang_bug.h> // TODO: remove this once clang 3.5.2 is released

25

24

#include <boost/variant.hpp>

26

25

27

26

using namespace std;

Older »