Diffusion MITK b3b61912b8d8

Merge commit 'daa14309739e58005a0efaf69649d14e52982111' into bug-16640…
b3b61912b8d8
Actions

Description

Merge commit 'daa14309739e58005a0efaf69649d14e52982111' into bug-16640-cppmicroservices-service-hooks

Conflicts:
Core/CppMicroServices/src/util/usUtils.cpp

Details

Provenance

zelzer

Authored on Dec 10 2013, 7:37 AM

Parents

rMITKdaa14309739e: Squashed 'Core/CppMicroServices/' changes from 15b6fc3..3019383
rMITKd8779ffb21d4: Merge branch 'bug-16628-missing-dicom-table-view-update'

Branches

Unknown

Tags

Unknown

Event Timeline

zelzer committed rMITKb3b61912b8d8: Merge commit 'daa14309739e58005a0efaf69649d14e52982111' into bug-16640… (authored by zelzer).Dec 10 2013, 7:37 AM

Merged Changes

daa14309739e Squashed 'Core/CppMicroServices/' changes from 15b6fc3..3019383
Author
zelzer
Browse Repository
No Builds
No Audits

Changes (83)

Path

Size

Core/

CppMicroServices/

.travis.yml

CMakeLists.txt

documentation/

CMakeDoxygenFilter.cpp

doxygen/

standalone/

BuildInstructions.md

snippets/

uServices-resources/

main.cpp

uServices-servicetracker/

examples/

driver/

src/

module/

	usCoreModuleActivator.cpp
	usCoreModuleContext.cpp

usCoreModuleContext.cpp

usCoreModuleContext_p.h

usModule.cpp

usModule.h

usModuleAbstractTracked.tpp

usModuleAbstractTracked_p.h

usModuleContext.cpp

usModuleContext.h

	usModuleEventHook.cpp
	usCoreModuleContext.cpp

usModuleEventHook.h

	usModuleFindHook.cpp
	usCoreModuleContext.cpp

usModuleFindHook.h

usModuleHooks.cpp

	usModuleHooks_p.h
	usCoreModuleContext_p.h

service/

usServiceEventListenerHook.h

usServiceListenerEntry.cpp

usServiceListenerEntry_p.h

usServiceListenerHook.cpp

usServiceListenerHook.h

usServiceListenerHook_p.h

usServiceListeners.cpp

usServiceListeners_p.h

usServiceReference.h

usServiceReferenceBase.cpp

usServiceReferenceBase.h

usServiceReferenceBasePrivate.cpp

usServiceRegistration.h

usServiceRegistrationBase.cpp

usServiceRegistrationBase.h

usServiceRegistrationBasePrivate.h

usServiceRegistry.cpp

usServiceRegistry_p.h

usServiceTracker.h

usServiceTracker.tpp

usServiceTrackerCustomizer.h

usServiceTrackerPrivate.h

usTrackedService.tpp

	service/
	module/

	usServiceEventListenerHook.cpp
	usCoreModuleContext.cpp

	usServiceFindHook.cpp
	usCoreModuleContext.cpp

util/

usAtomicInt_p.h

usFunctor_p.h

	usListenerFunctors_p.h
	usUtils_p.h

usUncompressResourceData.cpp

usUtils.cpp

usUtils_p.h

	usWaitCondition_p.h
	usThreads.cpp

test/

CMakeLists.txt

modules/

libSL1/

usActivatorSL1.cpp

libSL3/

usActivatorSL3.cpp

usDebugOutputTest.cpp

usModuleHooksTest.cpp

usServiceHooksTest.cpp

usServiceTemplateTest.cpp

usServiceTrackerTest.cpp

usTestManager.cpp

usTestingMacros.h

usConfig.h.in

rMITKb3b61912b8d8

View Options

Core/CppMicroServices/.travis.yml

View Options

Core/CppMicroServices/CMakeLists.txt

View Options

Core/CppMicroServices/documentation/CMakeDoxygenFilter.cpp

View Options

Core/CppMicroServices/documentation/doxygen/standalone/BuildInstructions.md

View Options

Core/CppMicroServices/documentation/snippets/uServices-resources/main.cpp

View Options

Core/CppMicroServices/documentation/snippets/uServices-servicetracker/main.cpp

View Options

Core/CppMicroServices/examples/CMakeLists.txt

View Options

Core/CppMicroServices/examples/driver/main.cpp

View Options

Core/CppMicroServices/src/CMakeLists.txt

View Options

Core/CppMicroServices/src/module/usCoreModuleActivator.cpp

View Options

Core/CppMicroServices/src/module/usCoreModuleContext.cpp

View Options

Core/CppMicroServices/src/module/usCoreModuleContext_p.h

View Options

Core/CppMicroServices/src/module/usModule.cpp

View Options

Core/CppMicroServices/src/module/usModule.h

View Options

Core/CppMicroServices/src/module/usModuleAbstractTracked.tpp

View Options

Core/CppMicroServices/src/module/usModuleAbstractTracked_p.h

View Options

Core/CppMicroServices/src/module/usModuleContext.cpp

View Options

Core/CppMicroServices/src/module/usModuleContext.h

View Options

Core/CppMicroServices/src/module/usModuleEventHook.cpp

View Options

Core/CppMicroServices/src/module/usModuleEventHook.h

View Options

Core/CppMicroServices/src/module/usModuleFindHook.cpp

View Options

Core/CppMicroServices/src/module/usModuleFindHook.h

View Options

Core/CppMicroServices/src/module/usModuleHooks.cpp

View Options

Core/CppMicroServices/src/module/usModuleHooks_p.h

View Options

Core/CppMicroServices/src/module/usModulePrivate.cpp

View Options

Core/CppMicroServices/src/module/usModuleRegistry.cpp

View Options

Core/CppMicroServices/src/module/usModuleRegistry.h

View Options

Core/CppMicroServices/src/module/usModuleSettings.cpp

View Options

Core/CppMicroServices/src/module/usModuleUtils.cpp

View Options

Core/CppMicroServices/src/service/usServiceEvent.h

View Options

Core/CppMicroServices/src/service/usServiceEventListenerHook.cpp

View Options

Core/CppMicroServices/src/service/usServiceEventListenerHook.h

View Options

Core/CppMicroServices/src/service/usServiceFindHook.cpp

View Options

Core/CppMicroServices/src/service/usServiceFindHook.h

View Options

Core/CppMicroServices/src/service/usServiceHooks.cpp

View Options

Core/CppMicroServices/src/service/usServiceHooks_p.h

View Options

Core/CppMicroServices/src/service/usServiceInterface.h

View Options

Core/CppMicroServices/src/service/usServiceListenerEntry.cpp

View Options

Core/CppMicroServices/src/service/usServiceListenerEntry_p.h

View Options

Core/CppMicroServices/src/service/usServiceListenerHook.cpp

View Options

Core/CppMicroServices/src/service/usServiceListenerHook.h

View Options

Core/CppMicroServices/src/service/usServiceListenerHook_p.h

View Options

Core/CppMicroServices/src/service/usServiceListeners.cpp

View Options

Core/CppMicroServices/src/service/usServiceListeners_p.h

View Options

Core/CppMicroServices/src/service/usServiceReference.h

View Options

Core/CppMicroServices/src/service/usServiceReferenceBase.cpp

View Options

Core/CppMicroServices/src/service/usServiceReferenceBase.h

View Options

Core/CppMicroServices/src/service/usServiceReferenceBasePrivate.cpp

View Options

Core/CppMicroServices/src/service/usServiceRegistration.h

View Options

Core/CppMicroServices/src/service/usServiceRegistrationBase.cpp

View Options

Core/CppMicroServices/src/service/usServiceRegistrationBase.h

View Options

Core/CppMicroServices/src/service/usServiceRegistrationBasePrivate.h

View Options

Core/CppMicroServices/src/service/usServiceRegistry.cpp

View Options

Core/CppMicroServices/src/service/usServiceRegistry_p.h

View Options

Core/CppMicroServices/src/service/usServiceTracker.h

View Options

Core/CppMicroServices/src/service/usServiceTracker.tpp

View Options

Core/CppMicroServices/src/service/usServiceTrackerCustomizer.h

View Options

Core/CppMicroServices/src/service/usServiceTrackerPrivate.h

View Options

Core/CppMicroServices/src/service/usTrackedService.tpp

View Options

Core/CppMicroServices/src/util/usAtomicInt_p.h

View Options

Core/CppMicroServices/src/util/usFunctor_p.h

View Options

Core/CppMicroServices/src/util/usListenerFunctors_p.h

View Options

Core/CppMicroServices/src/util/usLog_p.h

View Options

Core/CppMicroServices/src/util/usShrinkableMap.h

View Options

Core/CppMicroServices/src/util/usShrinkableVector.h

View Options

Core/CppMicroServices/src/util/usStaticInit_p.h

View Options

Core/CppMicroServices/src/util/usThreads.cpp

View Options

Core/CppMicroServices/src/util/usThreads_p.h

View Options

Core/CppMicroServices/src/util/usUncompressResourceData.cpp

View Options

Core/CppMicroServices/src/util/usUtils.cpp

View Options

Core/CppMicroServices/src/util/usUtils_p.h

View Options

Core/CppMicroServices/src/util/usWaitCondition_p.h

View Options

Core/CppMicroServices/test/CMakeLists.txt

View Options

Core/CppMicroServices/test/modules/libSL1/usActivatorSL1.cpp

View Options

Core/CppMicroServices/test/modules/libSL3/usActivatorSL3.cpp

View Options

Core/CppMicroServices/test/usDebugOutputTest.cpp

View Options

Core/CppMicroServices/test/usModuleHooksTest.cpp

View Options

Core/CppMicroServices/test/usServiceHooksTest.cpp

View Options

Core/CppMicroServices/test/usServiceTemplateTest.cpp

View Options

Core/CppMicroServices/test/usServiceTrackerTest.cpp

View Options

Core/CppMicroServices/test/usTestManager.cpp

View Options

Core/CppMicroServices/test/usTestingMacros.h

View Options

Core/CppMicroServices/usConfig.h.in

Merge commit 'daa14309739e58005a0efaf69649d14e52982111' into bug-16640…b3b61912b8d8Actions

Description

Details

Event Timeline

Merged Changes

Changes (83)

rMITKb3b61912b8d8

Core/CppMicroServices/.travis.yml

Core/CppMicroServices/CMakeLists.txt

Core/CppMicroServices/documentation/CMakeDoxygenFilter.cpp

Core/CppMicroServices/documentation/doxygen/standalone/BuildInstructions.md

Core/CppMicroServices/documentation/snippets/uServices-resources/main.cpp

Core/CppMicroServices/documentation/snippets/uServices-servicetracker/main.cpp

Core/CppMicroServices/examples/CMakeLists.txt

Core/CppMicroServices/examples/driver/main.cpp

Core/CppMicroServices/src/CMakeLists.txt

Core/CppMicroServices/src/module/usCoreModuleActivator.cpp

Core/CppMicroServices/src/module/usCoreModuleContext.cpp

Core/CppMicroServices/src/module/usCoreModuleContext_p.h

Core/CppMicroServices/src/module/usModule.cpp

Core/CppMicroServices/src/module/usModule.h

Core/CppMicroServices/src/module/usModuleAbstractTracked.tpp

Core/CppMicroServices/src/module/usModuleAbstractTracked_p.h

Core/CppMicroServices/src/module/usModuleContext.cpp

Core/CppMicroServices/src/module/usModuleContext.h

Core/CppMicroServices/src/module/usModuleEventHook.cpp

Core/CppMicroServices/src/module/usModuleEventHook.h

Core/CppMicroServices/src/module/usModuleFindHook.cpp

Core/CppMicroServices/src/module/usModuleFindHook.h

Core/CppMicroServices/src/module/usModuleHooks.cpp

Core/CppMicroServices/src/module/usModuleHooks_p.h

Core/CppMicroServices/src/module/usModulePrivate.cpp

Core/CppMicroServices/src/module/usModuleRegistry.cpp

Core/CppMicroServices/src/module/usModuleRegistry.h

Core/CppMicroServices/src/module/usModuleSettings.cpp

Core/CppMicroServices/src/module/usModuleUtils.cpp

Core/CppMicroServices/src/service/usServiceEvent.h

Core/CppMicroServices/src/service/usServiceEventListenerHook.cpp

Core/CppMicroServices/src/service/usServiceEventListenerHook.h

Core/CppMicroServices/src/service/usServiceFindHook.cpp

Core/CppMicroServices/src/service/usServiceFindHook.h

Core/CppMicroServices/src/service/usServiceHooks.cpp

Core/CppMicroServices/src/service/usServiceHooks_p.h

Core/CppMicroServices/src/service/usServiceInterface.h

Core/CppMicroServices/src/service/usServiceListenerEntry.cpp

Core/CppMicroServices/src/service/usServiceListenerEntry_p.h

Core/CppMicroServices/src/service/usServiceListenerHook.cpp

Core/CppMicroServices/src/service/usServiceListenerHook.h

Core/CppMicroServices/src/service/usServiceListenerHook_p.h

Core/CppMicroServices/src/service/usServiceListeners.cpp

Core/CppMicroServices/src/service/usServiceListeners_p.h

Core/CppMicroServices/src/service/usServiceReference.h

Core/CppMicroServices/src/service/usServiceReferenceBase.cpp

Core/CppMicroServices/src/service/usServiceReferenceBase.h

Core/CppMicroServices/src/service/usServiceReferenceBasePrivate.cpp

Core/CppMicroServices/src/service/usServiceRegistration.h

Core/CppMicroServices/src/service/usServiceRegistrationBase.cpp

Core/CppMicroServices/src/service/usServiceRegistrationBase.h

Core/CppMicroServices/src/service/usServiceRegistrationBasePrivate.h

Core/CppMicroServices/src/service/usServiceRegistry.cpp

Core/CppMicroServices/src/service/usServiceRegistry_p.h

Core/CppMicroServices/src/service/usServiceTracker.h

Core/CppMicroServices/src/service/usServiceTracker.tpp

Core/CppMicroServices/src/service/usServiceTrackerCustomizer.h

Core/CppMicroServices/src/service/usServiceTrackerPrivate.h

Core/CppMicroServices/src/service/usTrackedService.tpp

Core/CppMicroServices/src/util/usAtomicInt_p.h

Core/CppMicroServices/src/util/usFunctor_p.h

Core/CppMicroServices/src/util/usListenerFunctors_p.h

Core/CppMicroServices/src/util/usLog_p.h

Core/CppMicroServices/src/util/usShrinkableMap.h

Core/CppMicroServices/src/util/usShrinkableVector.h

Core/CppMicroServices/src/util/usStaticInit_p.h

Core/CppMicroServices/src/util/usThreads.cpp

Core/CppMicroServices/src/util/usThreads_p.h

Core/CppMicroServices/src/util/usUncompressResourceData.cpp

Core/CppMicroServices/src/util/usUtils.cpp

Core/CppMicroServices/src/util/usUtils_p.h

Core/CppMicroServices/src/util/usWaitCondition_p.h

Core/CppMicroServices/test/CMakeLists.txt

Merge commit 'daa14309739e58005a0efaf69649d14e52982111' into bug-16640…
b3b61912b8d8
Actions