From c1756f3d9b43ae08838ed0fb9613712bfa4b4bd0 Mon Sep 17 00:00:00 2001 From: Milan Vukov Date: Sat, 26 Sep 2020 13:05:34 +0200 Subject: [PATCH] Normalize include paths --- CMakeLists.txt | 3 +- rtt/Activity.cpp | 14 +- rtt/Activity.hpp | 12 +- rtt/ArgumentDescription.cpp | 2 +- rtt/ArgumentDescription.hpp | 2 +- rtt/Attribute.cpp | 4 +- rtt/Attribute.hpp | 6 +- rtt/BufferPolicy.cpp | 2 +- rtt/BufferPolicy.hpp | 2 +- rtt/Component.hpp | 8 +- rtt/ConfigurationInterface.cpp | 4 +- rtt/ConfigurationInterface.hpp | 10 +- rtt/ConnPolicy.cpp | 6 +- rtt/ConnPolicy.hpp | 6 +- rtt/DataFlowInterface.cpp | 8 +- rtt/DataFlowInterface.hpp | 6 +- rtt/ExecutionEngine.cpp | 20 +- rtt/ExecutionEngine.hpp | 20 +- rtt/FactoryExceptions.cpp | 2 +- rtt/FactoryExceptions.hpp | 2 +- rtt/FlowStatus.cpp | 2 +- rtt/FlowStatus.hpp | 2 +- rtt/Handle.cpp | 4 +- rtt/Handle.hpp | 2 +- rtt/InputPort.hpp | 12 +- rtt/Logger.cpp | 16 +- rtt/Logger.hpp | 10 +- rtt/Operation.cpp | 2 +- rtt/Operation.hpp | 8 +- rtt/OperationCaller.hpp | 18 +- rtt/OperationInterface.cpp | 10 +- rtt/OperationInterface.hpp | 12 +- rtt/OperationInterfacePart.hpp | 6 +- rtt/OutputPort.hpp | 18 +- rtt/Port.hpp | 4 +- rtt/Property.cpp | 4 +- rtt/Property.hpp | 12 +- rtt/PropertyBag.cpp | 12 +- rtt/PropertyBag.hpp | 2 +- rtt/RTT.hpp | 18 +- rtt/SendHandle.hpp | 12 +- rtt/SendStatus.cpp | 2 +- rtt/SendStatus.hpp | 2 +- rtt/Service.cpp | 6 +- rtt/Service.hpp | 24 +- rtt/ServiceRequester.cpp | 10 +- rtt/ServiceRequester.hpp | 8 +- rtt/TaskContext.cpp | 20 +- rtt/TaskContext.hpp | 12 +- rtt/Time.hpp | 2 +- rtt/base/ActionInterface.cpp | 4 +- rtt/base/ActionInterface.hpp | 4 +- rtt/base/ActivityInterface.cpp | 4 +- rtt/base/ActivityInterface.hpp | 6 +- rtt/base/AttributeBase.hpp | 2 +- rtt/base/Buffer.hpp | 8 +- rtt/base/BufferBase.cpp | 4 +- rtt/base/BufferBase.hpp | 4 +- rtt/base/BufferInterface.hpp | 4 +- rtt/base/BufferLockFree.cpp | 2 +- rtt/base/BufferLockFree.hpp | 14 +- rtt/base/BufferLocked.hpp | 6 +- rtt/base/BufferUnSync.hpp | 2 +- rtt/base/Buffers.hpp | 12 +- rtt/base/ChannelElement.hpp | 8 +- rtt/base/ChannelElementBase.hpp | 12 +- rtt/base/ChannelInterface.cpp | 6 +- rtt/base/CoreRunnableInterface.cpp | 4 +- rtt/base/DataObject.hpp | 8 +- rtt/base/DataObjectBase.cpp | 4 +- rtt/base/DataObjectBase.hpp | 2 +- rtt/base/DataObjectInterface.hpp | 4 +- rtt/base/DataObjectLockFree.hpp | 10 +- rtt/base/DataObjectLocked.hpp | 4 +- rtt/base/DataObjectUnSync.hpp | 2 +- rtt/base/DataSourceBase.hpp | 8 +- rtt/base/DisposableInterface.hpp | 2 +- rtt/base/ExecutableInterface.hpp | 4 +- rtt/base/InputPortInterface.cpp | 16 +- rtt/base/InputPortInterface.hpp | 12 +- rtt/base/OperationBase.cpp | 4 +- rtt/base/OperationBase.hpp | 8 +- rtt/base/OperationCallerBase.hpp | 6 +- rtt/base/OperationCallerBaseInvoker.hpp | 4 +- rtt/base/OperationCallerInterface.cpp | 4 +- rtt/base/OperationCallerInterface.hpp | 6 +- rtt/base/OutputPortInterface.cpp | 10 +- rtt/base/OutputPortInterface.hpp | 4 +- rtt/base/PortInterface.cpp | 10 +- rtt/base/PortInterface.hpp | 16 +- rtt/base/PropertyBagVisitor.cpp | 12 +- rtt/base/PropertyBagVisitor.hpp | 4 +- rtt/base/PropertyBase.cpp | 8 +- rtt/base/PropertyBase.hpp | 4 +- rtt/base/PropertyIntrospection.hpp | 6 +- rtt/base/PropertyIntrospection.inl | 8 +- rtt/base/RunnableInterface.hpp | 2 +- rtt/base/TaskCore.cpp | 12 +- rtt/base/TaskCore.hpp | 6 +- rtt/deployment/ComponentLoader.cpp | 14 +- rtt/deployment/ComponentLoader.hpp | 2 +- rtt/extras/Activities.hpp | 10 +- rtt/extras/FileDescriptorActivity.cpp | 8 +- rtt/extras/FileDescriptorActivity.hpp | 4 +- .../FileDescriptorActivityInterface.hpp | 2 +- .../FileDescriptorSimulationActivity.cpp | 4 +- .../FileDescriptorSimulationActivity.hpp | 6 +- rtt/extras/IRQActivity.cpp | 8 +- rtt/extras/IRQActivity.hpp | 4 +- rtt/extras/MultiVector.cpp | 2 +- rtt/extras/MultiVector.hpp | 2 +- rtt/extras/MultiVectorComposition.hpp | 8 +- rtt/extras/PeriodicActivity.cpp | 10 +- rtt/extras/PeriodicActivity.hpp | 8 +- rtt/extras/Properties.hpp | 8 +- rtt/extras/ReadOnlyPointer.hpp | 4 +- rtt/extras/SequentialActivity.cpp | 6 +- rtt/extras/SequentialActivity.hpp | 6 +- rtt/extras/SimulationActivity.cpp | 4 +- rtt/extras/SimulationActivity.hpp | 2 +- rtt/extras/SimulationThread.cpp | 16 +- rtt/extras/SimulationThread.hpp | 4 +- rtt/extras/SlaveActivity.cpp | 10 +- rtt/extras/SlaveActivity.hpp | 4 +- rtt/extras/TaskContexts.hpp | 12 +- rtt/extras/TimerThread.cpp | 14 +- rtt/extras/TimerThread.hpp | 6 +- rtt/extras/dev/AnalogInInterface.hpp | 6 +- rtt/extras/dev/AnalogInput.hpp | 2 +- rtt/extras/dev/AnalogOutInterface.hpp | 6 +- rtt/extras/dev/AnalogOutput.hpp | 2 +- rtt/extras/dev/AxisInterface.cpp | 2 +- rtt/extras/dev/AxisInterface.hpp | 8 +- rtt/extras/dev/CalibrationInterface.hpp | 2 +- rtt/extras/dev/DigitalInInterface.hpp | 6 +- rtt/extras/dev/DigitalInput.hpp | 2 +- rtt/extras/dev/DigitalOutInterface.hpp | 6 +- rtt/extras/dev/DigitalOutput.hpp | 2 +- rtt/extras/dev/DriveInterface.hpp | 4 +- rtt/extras/dev/EncoderInterface.cpp | 2 +- rtt/extras/dev/EncoderInterface.hpp | 6 +- rtt/extras/dev/HomingInterface.cpp | 2 +- rtt/extras/dev/HomingInterface.hpp | 2 +- rtt/extras/dev/NameServer.hpp | 2 +- rtt/extras/dev/NameServerRegistrator.hpp | 2 +- .../dev/PulseTrainGeneratorInterface.cpp | 2 +- .../dev/PulseTrainGeneratorInterface.hpp | 8 +- rtt/extras/dev/SensorInterface.cpp | 2 +- rtt/extras/dev/SensorInterface.hpp | 2 +- rtt/extras/dev/io.cpp | 16 +- rtt/internal/ArrayPartDataSource.hpp | 4 +- rtt/internal/AssignCommand.hpp | 4 +- rtt/internal/AtomicMWMRQueue.hpp | 4 +- rtt/internal/AtomicMWSRQueue.hpp | 4 +- rtt/internal/BindStorage.hpp | 6 +- rtt/internal/CatchConfig.cpp | 2 +- rtt/internal/ChannelBufferElement.hpp | 6 +- rtt/internal/ChannelDataElement.hpp | 6 +- rtt/internal/Channels.hpp | 4 +- rtt/internal/Collect.hpp | 4 +- rtt/internal/CollectBase.hpp | 6 +- rtt/internal/CollectSignature.hpp | 2 +- rtt/internal/ConnFactory.cpp | 10 +- rtt/internal/ConnFactory.hpp | 34 +- rtt/internal/ConnID.cpp | 2 +- rtt/internal/ConnID.hpp | 2 +- rtt/internal/ConnInputEndPoint.hpp | 4 +- rtt/internal/ConnOutputEndPoint.hpp | 6 +- rtt/internal/ConnectionManager.cpp | 12 +- rtt/internal/ConnectionManager.hpp | 18 +- rtt/internal/CreateSequence.hpp | 8 +- rtt/internal/DataObjectDataSource.hpp | 4 +- rtt/internal/DataSource.cpp | 10 +- rtt/internal/DataSource.hpp | 6 +- rtt/internal/DataSource.inl | 8 +- rtt/internal/DataSourceCommand.cpp | 4 +- rtt/internal/DataSourceCommand.hpp | 4 +- rtt/internal/DataSourceGenerator.hpp | 2 +- rtt/internal/DataSourceStorage.hpp | 4 +- rtt/internal/DataSourceTypeInfo.hpp | 8 +- rtt/internal/DataSourceTypeInfo.inl | 4 +- rtt/internal/DataSources.cpp | 2 +- rtt/internal/DataSources.hpp | 10 +- rtt/internal/DataSources.inl | 4 +- rtt/internal/Exceptions.hpp | 2 +- rtt/internal/FusedFunctorDataSource.hpp | 14 +- rtt/internal/GetSignature.hpp | 2 +- rtt/internal/GlobalEngine.cpp | 4 +- rtt/internal/GlobalEngine.hpp | 2 +- rtt/internal/GlobalService.cpp | 6 +- rtt/internal/GlobalService.hpp | 2 +- rtt/internal/InputPortSource.hpp | 4 +- rtt/internal/Invoker.hpp | 4 +- rtt/internal/InvokerBase.hpp | 6 +- rtt/internal/InvokerSignature.hpp | 4 +- rtt/internal/List.hpp | 6 +- rtt/internal/ListLockFree.cpp | 2 +- rtt/internal/ListLockFree.hpp | 6 +- rtt/internal/ListLocked.hpp | 4 +- rtt/internal/LocalOperationCaller.hpp | 18 +- rtt/internal/LockedQueue.hpp | 4 +- rtt/internal/MWSRQueue.hpp | 6 +- rtt/internal/OperationCallerC.cpp | 12 +- rtt/internal/OperationCallerC.hpp | 10 +- rtt/internal/OperationInterfacePartFused.cpp | 2 +- rtt/internal/OperationInterfacePartFused.hpp | 14 +- rtt/internal/PartDataSource.hpp | 4 +- rtt/internal/PortConnectionLock.hpp | 2 +- rtt/internal/Queue.hpp | 6 +- rtt/internal/Reference.hpp | 2 +- rtt/internal/RemoteOperationCaller.hpp | 8 +- rtt/internal/Return.hpp | 2 +- rtt/internal/ReturnSignature.hpp | 4 +- rtt/internal/SendHandleC.cpp | 12 +- rtt/internal/SendHandleC.hpp | 8 +- rtt/internal/SharedConnection.cpp | 6 +- rtt/internal/SharedConnection.hpp | 6 +- rtt/internal/Signal.hpp | 18 +- rtt/internal/SignalBase.cpp | 4 +- rtt/internal/SignalBase.hpp | 12 +- rtt/internal/TsPool.hpp | 2 +- rtt/internal/carray.hpp | 2 +- rtt/internal/signal0.hpp | 2 +- rtt/internal/signal1.hpp | 2 +- rtt/internal/signal2.hpp | 2 +- rtt/internal/signal3.hpp | 2 +- rtt/internal/signal4.hpp | 2 +- rtt/internal/signal5.hpp | 2 +- rtt/internal/signal6.hpp | 2 +- rtt/internal/signal7.hpp | 2 +- rtt/internal/signal_template.hpp | 6 +- rtt/internal/signature0.hpp | 2 +- rtt/internal/signature1.hpp | 2 +- rtt/internal/signature2.hpp | 2 +- rtt/internal/signature3.hpp | 2 +- rtt/internal/signature4.hpp | 2 +- rtt/internal/signature5.hpp | 2 +- rtt/internal/signature6.hpp | 2 +- rtt/internal/signature7.hpp | 2 +- rtt/internal/signature_template.hpp | 2 +- rtt/marsh/CPFDTD.cpp | 2 +- rtt/marsh/CPFDemarshaller.cpp | 10 +- rtt/marsh/CPFDemarshaller.hpp | 4 +- rtt/marsh/CPFMarshaller.cpp | 4 +- rtt/marsh/CPFMarshaller.hpp | 8 +- rtt/marsh/MarshallInterface.hpp | 4 +- rtt/marsh/Marshalling.cpp | 2 +- rtt/marsh/Marshalling.hpp | 8 +- rtt/marsh/MarshallingService.cpp | 12 +- rtt/marsh/MarshallingService.hpp | 6 +- rtt/marsh/PropertyBagIntrospector.cpp | 4 +- rtt/marsh/PropertyBagIntrospector.hpp | 10 +- rtt/marsh/PropertyDemarshaller.cpp | 8 +- rtt/marsh/PropertyDemarshaller.hpp | 2 +- rtt/marsh/PropertyLoader.cpp | 12 +- rtt/marsh/PropertyLoader.hpp | 4 +- rtt/marsh/PropertyMarshaller.cpp | 6 +- rtt/marsh/PropertyMarshaller.hpp | 2 +- rtt/marsh/TinyDemarshaller.cpp | 10 +- rtt/marsh/TinyDemarshaller.hpp | 2 +- rtt/marsh/XMLRPCDemarshaller.hpp | 6 +- rtt/marsh/XMLRPCMarshaller.hpp | 8 +- rtt/marsh/rtt-marsh-config.h.in | 6 +- rtt/marsh/tinyxml.cpp | 2 +- rtt/marsh/tinyxml.h | 2 +- rtt/marsh/tinyxmlerror.cpp | 2 +- rtt/marsh/tinyxmlparser.cpp | 2 +- rtt/os/Atomic.hpp | 2 +- rtt/os/CAS.hpp | 2 +- rtt/os/Condition.hpp | 8 +- rtt/os/MainThread.cpp | 4 +- rtt/os/MainThread.hpp | 2 +- rtt/os/Mutex.cpp | 2 +- rtt/os/Mutex.hpp | 12 +- rtt/os/MutexLock.hpp | 4 +- rtt/os/OS.hpp | 8 +- rtt/os/Semaphore.hpp | 6 +- rtt/os/StartStopManager.cpp | 2 +- rtt/os/StartStopManager.hpp | 4 +- rtt/os/Thread.cpp | 22 +- rtt/os/Thread.hpp | 8 +- rtt/os/ThreadInterface.cpp | 6 +- rtt/os/ThreadInterface.hpp | 8 +- rtt/os/Time.hpp | 2 +- rtt/os/TimeService.cpp | 4 +- rtt/os/TimeService.hpp | 4 +- rtt/os/Timer.cpp | 10 +- rtt/os/Timer.hpp | 14 +- rtt/os/ecos/ecosthreads.cpp | 4 +- rtt/os/ecos/fosi.c | 2 +- rtt/os/ecos/fosi.h | 4 +- rtt/os/ecos/fosi_internal.cpp | 6 +- rtt/os/exceptions.cpp | 4 +- rtt/os/fosi.h | 22 +- rtt/os/fosi_interface.h | 2 +- rtt/os/fosi_internal_interface.hpp | 4 +- rtt/os/gnulinux/fosi.c | 2 +- rtt/os/gnulinux/fosi.h | 2 +- rtt/os/gnulinux/fosi_internal.cpp | 8 +- rtt/os/gnulinux/gnuthreads.cpp | 2 +- rtt/os/gnulinux/traces/lttng_ust.c | 2 +- rtt/os/lxrt/fosi.c | 2 +- rtt/os/lxrt/fosi.h | 4 +- rtt/os/lxrt/fosi_internal.cpp | 10 +- rtt/os/lxrt/lxrtthreads.cpp | 2 +- rtt/os/macosx/fosi.c | 2 +- rtt/os/macosx/fosi_internal.cpp | 10 +- rtt/os/macosx/gnuthreads.cpp | 2 +- rtt/os/main.h | 4 +- rtt/os/oro_allocator.hpp | 4 +- rtt/os/oro_arch.h | 14 +- rtt/os/oro_gcc/oro_arch.h | 2 +- rtt/os/oro_i386/oro_arch.h | 2 +- rtt/os/oro_malloc.h | 4 +- rtt/os/oro_msvc/oro_arch.h | 2 +- rtt/os/oro_noasm/oro_arch.h | 4 +- rtt/os/oro_powerpc/oro_arch.h | 4 +- rtt/os/oro_powerpc/oro_system.h | 2 +- rtt/os/oro_x86_64/oro_arch.h | 2 +- rtt/os/rint.cpp | 2 +- rtt/os/rint.h | 2 +- rtt/os/rt_list.hpp | 2 +- rtt/os/rtconversions.cpp | 2 +- rtt/os/rtstreambufs.hpp | 2 +- rtt/os/rtstreams.cpp | 4 +- rtt/os/rtstreams.hpp | 6 +- rtt/os/startstop.cpp | 22 +- rtt/os/startstop.h | 2 +- rtt/os/targets/rtt-target.h.in | 4 +- rtt/os/threads.cpp | 4 +- rtt/os/threads.hpp | 4 +- rtt/os/tlsf/target.h | 2 +- rtt/os/tlsf/tlsf.c | 6 +- rtt/os/tlsf/tlsf.h | 2 +- rtt/os/traces.h | 4 +- rtt/os/win32/dlfcn.c | 628 +++++++++--------- rtt/os/win32/dlfcn.h | 126 ++-- rtt/os/win32/fosi.cpp | 2 +- rtt/os/win32/fosi.h | 6 +- rtt/os/win32/fosi_internal.cpp | 8 +- rtt/os/win32/winthreads.cpp | 2 +- rtt/os/xenomai/fosi.c | 2 +- rtt/os/xenomai/fosi.h | 4 +- rtt/os/xenomai/fosi_internal.cpp | 8 +- rtt/os/xenomai/xenothreads.cpp | 2 +- rtt/plugin/Plugin.hpp | 2 +- rtt/plugin/PluginLoader.cpp | 12 +- rtt/plugin/PluginLoader.hpp | 6 +- rtt/plugin/ServicePlugin.hpp | 6 +- rtt/plugin/pluginpath.cpp.in | 4 +- rtt/rt_string.cpp | 2 +- rtt/rt_string.hpp | 4 +- rtt/rtt-config.h.in | 6 +- rtt/rtt-fwd.hpp | 12 +- rtt/scripting/ArgumentsParser.cpp | 8 +- rtt/scripting/ArgumentsParser.hpp | 8 +- rtt/scripting/CallFunction.hpp | 14 +- rtt/scripting/CommandBinary.hpp | 4 +- rtt/scripting/CommandComposite.hpp | 4 +- rtt/scripting/CommandCounter.cpp | 2 +- rtt/scripting/CommandCounter.hpp | 4 +- rtt/scripting/CommandDataSource.hpp | 4 +- rtt/scripting/CommandFunctors.hpp | 4 +- rtt/scripting/CommandIllegal.cpp | 2 +- rtt/scripting/CommandIllegal.hpp | 4 +- rtt/scripting/CommandNOP.cpp | 2 +- rtt/scripting/CommandNOP.hpp | 4 +- rtt/scripting/CommandString.cpp | 2 +- rtt/scripting/CommandString.hpp | 4 +- rtt/scripting/CommonParser.cpp | 6 +- rtt/scripting/CommonParser.hpp | 4 +- rtt/scripting/ConditionBool.cpp | 2 +- rtt/scripting/ConditionBool.hpp | 4 +- rtt/scripting/ConditionBoolDataSource.cpp | 2 +- rtt/scripting/ConditionBoolDataSource.hpp | 6 +- rtt/scripting/ConditionBoolProperty.cpp | 2 +- rtt/scripting/ConditionBoolProperty.hpp | 6 +- rtt/scripting/ConditionCache.hpp | 4 +- rtt/scripting/ConditionCompare.hpp | 4 +- rtt/scripting/ConditionComposite.cpp | 2 +- rtt/scripting/ConditionComposite.hpp | 4 +- rtt/scripting/ConditionDSDuration.cpp | 2 +- rtt/scripting/ConditionDSDuration.hpp | 8 +- rtt/scripting/ConditionDuration.cpp | 2 +- rtt/scripting/ConditionDuration.hpp | 6 +- rtt/scripting/ConditionExpire.hpp | 4 +- rtt/scripting/ConditionFalse.hpp | 2 +- rtt/scripting/ConditionInterface.cpp | 2 +- rtt/scripting/ConditionInterface.hpp | 4 +- rtt/scripting/ConditionInvert.hpp | 2 +- rtt/scripting/ConditionOnce.cpp | 2 +- rtt/scripting/ConditionOnce.hpp | 4 +- rtt/scripting/ConditionParser.cpp | 18 +- rtt/scripting/ConditionParser.hpp | 8 +- rtt/scripting/ConditionTrue.hpp | 4 +- rtt/scripting/DataSourceCondition.cpp | 4 +- rtt/scripting/DataSourceCondition.hpp | 6 +- rtt/scripting/DataSourceTime.hpp | 6 +- rtt/scripting/DumpObject.cpp | 10 +- rtt/scripting/DumpObject.hpp | 6 +- rtt/scripting/EdgeCondition.cpp | 8 +- rtt/scripting/EdgeCondition.hpp | 6 +- rtt/scripting/ExpressionParser.cpp | 28 +- rtt/scripting/ExpressionParser.hpp | 14 +- rtt/scripting/FunctionFactory.cpp | 34 +- rtt/scripting/FunctionFactory.hpp | 8 +- rtt/scripting/FunctionGraph.cpp | 20 +- rtt/scripting/FunctionGraph.hpp | 12 +- rtt/scripting/FunctionGraphBuilder.cpp | 20 +- rtt/scripting/FunctionGraphBuilder.hpp | 4 +- rtt/scripting/GraphCopier.hpp | 2 +- rtt/scripting/ParsedStateMachine.cpp | 18 +- rtt/scripting/ParsedStateMachine.hpp | 4 +- rtt/scripting/Parser.cpp | 32 +- rtt/scripting/Parser.hpp | 12 +- rtt/scripting/PeerParser.cpp | 12 +- rtt/scripting/PeerParser.hpp | 8 +- rtt/scripting/ProgramExceptions.hpp | 2 +- rtt/scripting/ProgramGraphParser.cpp | 50 +- rtt/scripting/ProgramGraphParser.hpp | 18 +- rtt/scripting/ProgramGraphParser2.cpp | 6 +- rtt/scripting/ProgramInterface.cpp | 4 +- rtt/scripting/ProgramInterface.hpp | 12 +- rtt/scripting/ProgramService.cpp | 10 +- rtt/scripting/ProgramService.hpp | 6 +- rtt/scripting/PropertyParser.cpp | 16 +- rtt/scripting/PropertyParser.hpp | 6 +- rtt/scripting/ScriptParser.cpp | 24 +- rtt/scripting/ScriptParser.hpp | 6 +- rtt/scripting/Scripting.cpp | 2 +- rtt/scripting/Scripting.hpp | 8 +- rtt/scripting/ScriptingService.cpp | 26 +- rtt/scripting/ScriptingService.hpp | 10 +- rtt/scripting/SendHandleAlias.cpp | 2 +- rtt/scripting/SendHandleAlias.hpp | 6 +- rtt/scripting/StateDescription.cpp | 2 +- rtt/scripting/StateDescription.hpp | 4 +- rtt/scripting/StateGraphParser.cpp | 50 +- rtt/scripting/StateGraphParser.hpp | 4 +- rtt/scripting/StateInterface.cpp | 2 +- rtt/scripting/StateInterface.hpp | 6 +- rtt/scripting/StateMachine.cpp | 14 +- rtt/scripting/StateMachine.hpp | 16 +- rtt/scripting/StateMachineBuilder.cpp | 4 +- rtt/scripting/StateMachineBuilder.hpp | 2 +- rtt/scripting/StateMachineService.cpp | 10 +- rtt/scripting/StateMachineService.hpp | 4 +- rtt/scripting/StatementProcessor.cpp | 12 +- rtt/scripting/StatementProcessor.hpp | 4 +- rtt/scripting/TryCommand.cpp | 6 +- rtt/scripting/TryCommand.hpp | 10 +- rtt/scripting/ValueChangeParser.cpp | 20 +- rtt/scripting/ValueChangeParser.hpp | 18 +- rtt/scripting/ValueParser.cpp | 16 +- rtt/scripting/ValueParser.hpp | 10 +- rtt/scripting/VertexNode.cpp | 8 +- rtt/scripting/VertexNode.hpp | 4 +- rtt/scripting/parse_exception.cpp | 2 +- rtt/scripting/parse_exception.hpp | 4 +- rtt/scripting/parser-types.hpp | 10 +- rtt/scripting/rtt-scripting-config.h.in | 6 +- rtt/transports/corba/AnyDataSource.cpp | 4 +- rtt/transports/corba/AnyDataSource.hpp | 4 +- rtt/transports/corba/ApplicationServer.cpp | 4 +- rtt/transports/corba/ApplicationServer.hpp | 4 +- .../corba/ConfigurationInterfaceI.cpp | 12 +- .../corba/ConfigurationInterfaceI.h | 6 +- rtt/transports/corba/CorbaConnPolicy.cpp | 2 +- rtt/transports/corba/CorbaConnPolicy.hpp | 2 +- rtt/transports/corba/CorbaConversion.cpp | 6 +- rtt/transports/corba/CorbaConversion.hpp | 8 +- rtt/transports/corba/CorbaDispatcher.cpp | 2 +- rtt/transports/corba/CorbaDispatcher.hpp | 18 +- rtt/transports/corba/CorbaLib.cpp | 16 +- .../corba/CorbaOperationCallerFactory.cpp | 18 +- .../corba/CorbaOperationCallerFactory.hpp | 10 +- .../corba/CorbaTemplateProtocol.hpp | 16 +- rtt/transports/corba/CorbaTypeTransporter.cpp | 4 +- rtt/transports/corba/CorbaTypeTransporter.hpp | 4 +- rtt/transports/corba/DataFlowI.cpp | 28 +- rtt/transports/corba/DataFlowI.h | 12 +- rtt/transports/corba/DataSourceProxy.hpp | 12 +- rtt/transports/corba/OperationCallerProxy.hpp | 4 +- rtt/transports/corba/OperationInterfaceI.cpp | 20 +- rtt/transports/corba/OperationInterfaceI.h | 8 +- rtt/transports/corba/POAUtility.cpp | 588 ++++++++-------- rtt/transports/corba/POAUtility.h | 124 ++-- rtt/transports/corba/RTTCorbaConversion.hpp | 10 +- rtt/transports/corba/RemoteChannelElement.hpp | 10 +- rtt/transports/corba/RemoteConnID.cpp | 2 +- rtt/transports/corba/RemoteConnID.hpp | 2 +- rtt/transports/corba/RemotePorts.cpp | 18 +- rtt/transports/corba/RemotePorts.hpp | 10 +- rtt/transports/corba/ServiceI.cpp | 4 +- rtt/transports/corba/ServiceI.h | 10 +- rtt/transports/corba/ServiceRequesterI.cpp | 6 +- rtt/transports/corba/ServiceRequesterI.h | 4 +- rtt/transports/corba/TaskContextFactory.cpp | 4 +- rtt/transports/corba/TaskContextFactory.hpp | 2 +- rtt/transports/corba/TaskContextI.cpp | 16 +- rtt/transports/corba/TaskContextI.h | 4 +- rtt/transports/corba/TaskContextProxy.cpp | 18 +- rtt/transports/corba/TaskContextProxy.hpp | 8 +- rtt/transports/corba/TaskContextServer.cpp | 18 +- rtt/transports/corba/TaskContextServer.hpp | 8 +- rtt/transports/corba/TransportPlugin.hpp | 2 +- rtt/transports/corba/rtt-corba-config.h.in | 6 +- rtt/transports/mqueue/Dispatcher.cpp | 2 +- rtt/transports/mqueue/Dispatcher.hpp | 8 +- rtt/transports/mqueue/MQChannelElement.hpp | 10 +- rtt/transports/mqueue/MQLib.cpp | 10 +- rtt/transports/mqueue/MQLib.hpp | 2 +- rtt/transports/mqueue/MQSendRecv.cpp | 16 +- rtt/transports/mqueue/MQSendRecv.hpp | 4 +- .../mqueue/MQSerializationProtocol.hpp | 4 +- rtt/transports/mqueue/MQTemplateProtocol.hpp | 8 +- .../mqueue/MQTemplateProtocolBase.hpp | 6 +- rtt/transports/mqueue/TransportPlugin.hpp | 2 +- rtt/typekit/BoolTypeInfo.hpp | 4 +- rtt/typekit/ConnPolicyType.hpp | 2 +- rtt/typekit/RTStringTypeInfo.hpp | 6 +- rtt/typekit/RTTTypes.hpp | 10 +- rtt/typekit/RealTimeTypekit.cpp | 4 +- rtt/typekit/RealTimeTypekit.hpp | 4 +- rtt/typekit/RealTimeTypekitConstructors.cpp | 20 +- rtt/typekit/RealTimeTypekitGlobals.cpp | 20 +- rtt/typekit/RealTimeTypekitOperators.cpp | 24 +- rtt/typekit/RealTimeTypekitStdTypes.cpp | 8 +- rtt/typekit/RealTimeTypekitTypes.cpp | 12 +- rtt/typekit/RealTimeTypekitTypes2.cpp | 28 +- rtt/typekit/StdStringTypeInfo.hpp | 4 +- rtt/typekit/StdTypeInfo.hpp | 6 +- rtt/typekit/StdVectorTypeInfo.hpp | 8 +- rtt/typekit/Types.hpp | 6 +- rtt/typekit/Types.inc | 22 +- rtt/typekit/Types2.inc | 12 +- rtt/typekit/rtt-typekit-config.h.in | 6 +- rtt/types/BoostArrayTypeInfo.hpp | 14 +- rtt/types/CArrayTypeInfo.hpp | 12 +- rtt/types/CompositionFactory.cpp | 2 +- rtt/types/CompositionFactory.hpp | 2 +- rtt/types/EnumTypeInfo.hpp | 8 +- rtt/types/GlobalsRepository.cpp | 2 +- rtt/types/GlobalsRepository.hpp | 2 +- rtt/types/MemberFactory.cpp | 4 +- rtt/types/MemberFactory.hpp | 6 +- rtt/types/OperatorTypes.hpp | 4 +- rtt/types/Operators.cpp | 12 +- rtt/types/Operators.hpp | 2 +- rtt/types/PrimitiveSequenceTypeInfo.hpp | 6 +- rtt/types/PrimitiveTypeInfo.hpp | 18 +- rtt/types/PropertyComposition.cpp | 10 +- rtt/types/PropertyComposition.hpp | 4 +- rtt/types/PropertyDecomposition.cpp | 10 +- rtt/types/PropertyDecomposition.hpp | 4 +- rtt/types/SequenceConstructor.hpp | 4 +- rtt/types/SequenceTypeInfo.hpp | 6 +- rtt/types/SequenceTypeInfoBase.cpp | 2 +- rtt/types/SequenceTypeInfoBase.hpp | 14 +- rtt/types/StdVectorTemplateTypeInfo.hpp | 14 +- rtt/types/StreamFactory.cpp | 4 +- rtt/types/StreamFactory.hpp | 4 +- rtt/types/StructTypeInfo.hpp | 8 +- rtt/types/TemplateCompositionFactory.hpp | 6 +- rtt/types/TemplateConnFactory.hpp | 8 +- rtt/types/TemplateConstructor.hpp | 10 +- rtt/types/TemplateTypeInfo.hpp | 20 +- rtt/types/TemplateValueFactory.hpp | 10 +- rtt/types/TransportPlugin.hpp | 2 +- rtt/types/TypeConstructor.cpp | 2 +- rtt/types/TypeConstructor.hpp | 2 +- rtt/types/TypeInfo.cpp | 20 +- rtt/types/TypeInfo.hpp | 14 +- rtt/types/TypeInfoGenerator.hpp | 4 +- rtt/types/TypeInfoName.hpp | 10 +- rtt/types/TypeInfoRepository.cpp | 22 +- rtt/types/TypeInfoRepository.hpp | 4 +- rtt/types/TypeMarshaller.hpp | 2 +- rtt/types/TypeStream-io.cpp | 2 +- rtt/types/TypeStream.cpp | 4 +- rtt/types/TypeStream.hpp | 2 +- rtt/types/TypeTransporter.hpp | 6 +- rtt/types/TypekitPlugin.hpp | 4 +- rtt/types/TypekitRepository.cpp | 8 +- rtt/types/TypekitRepository.hpp | 4 +- rtt/types/Types.cpp | 4 +- rtt/types/Types.hpp | 6 +- rtt/types/ValueFactory.cpp | 4 +- rtt/types/ValueFactory.hpp | 8 +- rtt/types/VectorTemplateComposition.hpp | 10 +- rtt/types/type_discovery.hpp | 10 +- tests/FakeAnalogDevice.hpp | 4 +- tests/FakeDigitalDevice.hpp | 4 +- tests/buffers_test.cpp | 20 +- tests/channelelements_test.cpp | 4 +- tests/cleanup_corba.cpp | 2 +- tests/configuration_test.cpp | 8 +- tests/corba_ipc_server.cpp | 28 +- tests/corba_ipc_test.cpp | 28 +- tests/corba_mqueue_ipc_server.cpp | 12 +- tests/corba_mqueue_ipc_test.cpp | 24 +- tests/corba_mqueue_test.cpp | 12 +- tests/corba_mqueue_test.hpp | 12 +- tests/corba_test.cpp | 32 +- tests/dataflow_performance_test.cpp | 18 +- tests/datasource_fixture.cpp | 2 +- tests/datasource_fixture.hpp | 4 +- tests/datasource_test.cpp | 16 +- tests/dev_test.cpp | 18 +- tests/dispatch_test.cpp | 14 +- tests/dispatch_test.hpp | 6 +- tests/enum_string_type_test.cpp | 20 +- tests/enum_type_test.cpp | 20 +- tests/event_test.cpp | 20 +- tests/function_test.cpp | 14 +- tests/functors_test.cpp | 16 +- tests/generictask_test.cpp | 18 +- tests/generictask_test.hpp | 2 +- tests/listlocked_test.cpp | 6 +- tests/logger_test.cpp | 8 +- tests/logger_test.hpp | 2 +- tests/marshalling_test.cpp | 12 +- tests/method_test.cpp | 12 +- tests/mqueue_archive_test.cpp | 8 +- tests/mqueue_ipc_server.cpp | 12 +- tests/mqueue_ipc_test.cpp | 12 +- tests/mqueue_test.cpp | 18 +- tests/operation_test.cpp | 12 +- tests/operations_fixture.cpp | 10 +- tests/operations_fixture.hpp | 4 +- tests/operations_fixture0.cpp | 10 +- tests/operations_fixture1.cpp | 10 +- tests/operations_fixture2.cpp | 10 +- tests/operations_fixture3.cpp | 10 +- tests/operations_fixture4.cpp | 10 +- tests/operations_fixture5.cpp | 10 +- tests/operations_fixture6.cpp | 10 +- tests/operations_fixture7.cpp | 10 +- tests/plugins_test.cpp | 10 +- tests/ports_test.cpp | 18 +- tests/program_test.cpp | 20 +- tests/property_composition_test.cpp | 12 +- tests/property_loader_test.cpp | 6 +- tests/property_marsh_test.cpp | 12 +- tests/property_test.cpp | 12 +- tests/ptr_test.cpp | 4 +- tests/ptr_test.hpp | 2 +- tests/remote_method_test.cpp | 16 +- tests/rtstring_test.cpp | 28 +- tests/scripting_test.cpp | 18 +- tests/service_port_test.cpp | 16 +- tests/service_test.cpp | 16 +- tests/setup_corba.cpp | 2 +- tests/slave_test.cpp | 18 +- tests/specialized_activities.cpp | 8 +- tests/state_test.cpp | 32 +- tests/tasks_multiple_test.cpp | 8 +- tests/tasks_multiple_test.hpp | 4 +- tests/tasks_test.cpp | 10 +- tests/tasks_test.hpp | 8 +- tests/taskstates_test.cpp | 16 +- tests/taskthread_fd_test.cpp | 10 +- tests/taskthread_test.cpp | 14 +- tests/taskthread_test.hpp | 10 +- tests/test-corba-main.cpp | 8 +- tests/test-main.cpp | 4 +- tests/test-runner-corba.cpp | 14 +- tests/test-runner.cpp | 10 +- tests/test-runner.hpp | 4 +- .../plugins/plugins_test_global_services.cpp | 4 +- .../plugins/plugins_test_services.cpp | 4 +- .../testproject/types/plugins_test_types.cpp | 2 +- tests/testtypes/MatrixTypeInfo.hpp | 8 +- tests/testtypes/types/array_types.cpp | 10 +- tests/testtypes/types/plugins_test_types.cpp | 8 +- tests/testtypes/types/sequence_types.cpp | 6 +- tests/testtypes/types/struct_types.cpp | 6 +- tests/time_test.cpp | 8 +- tests/time_test.hpp | 6 +- tests/tlsf_test.cpp | 4 +- tests/type_discovery_container_test.cpp | 20 +- tests/type_discovery_struct_test.cpp | 20 +- tests/type_discovery_test.cpp | 20 +- tests/typekit_test.cpp | 12 +- tests/types_test.cpp | 34 +- tests/unit.hpp | 10 +- 686 files changed, 3321 insertions(+), 3320 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd7081a93..b219ffbfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,6 +123,7 @@ INCLUDE(config/rtt_macros.cmake) ########################################################### INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) ADD_SUBDIRECTORY(rtt) ADD_SUBDIRECTORY(doc) ADD_SUBDIRECTORY(tests) @@ -154,7 +155,7 @@ set(IMPORTED_TARGET_PREFIX "imported_") # Prefix used in other projects to disti # Main package configuration file + target specific file CONFIGURE_FILE(orocos-rtt-config.cmake.in orocos-rtt-config-${OROCOS_TARGET}.cmake @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/orocos-rtt-config.cmake +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/orocos-rtt-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/orocos-rtt-config-${OROCOS_TARGET}.cmake DESTINATION "${CONFIG_FILE_PATH}") diff --git a/rtt/Activity.cpp b/rtt/Activity.cpp index 5b6ad1586..163012793 100644 --- a/rtt/Activity.cpp +++ b/rtt/Activity.cpp @@ -40,13 +40,13 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "Time.hpp" -#include "Activity.hpp" -#include "os/MutexLock.hpp" -#include "os/traces.h" -#include "Logger.hpp" -#include "rtt-fwd.hpp" -#include "os/fosi_internal_interface.hpp" +#include "rtt/Time.hpp" +#include "rtt/Activity.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/os/traces.h" +#include "rtt/Logger.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/os/fosi_internal_interface.hpp" #include diff --git a/rtt/Activity.hpp b/rtt/Activity.hpp index 14d0305f3..e4b8e9fd8 100644 --- a/rtt/Activity.hpp +++ b/rtt/Activity.hpp @@ -39,12 +39,12 @@ #ifndef ORO_ACTIVITY_HPP #define ORO_ACTIVITY_HPP -#include "Time.hpp" -#include "base/RunnableInterface.hpp" -#include "base/ActivityInterface.hpp" -#include "os/Thread.hpp" -#include "os/Mutex.hpp" -#include "os/Condition.hpp" +#include "rtt/Time.hpp" +#include "rtt/base/RunnableInterface.hpp" +#include "rtt/base/ActivityInterface.hpp" +#include "rtt/os/Thread.hpp" +#include "rtt/os/Mutex.hpp" +#include "rtt/os/Condition.hpp" namespace RTT { diff --git a/rtt/ArgumentDescription.cpp b/rtt/ArgumentDescription.cpp index 60986a95a..3e250580f 100644 --- a/rtt/ArgumentDescription.cpp +++ b/rtt/ArgumentDescription.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "ArgumentDescription.hpp" +#include "rtt/ArgumentDescription.hpp" using namespace RTT; diff --git a/rtt/ArgumentDescription.hpp b/rtt/ArgumentDescription.hpp index a69ab1e4c..45e34a4e1 100644 --- a/rtt/ArgumentDescription.hpp +++ b/rtt/ArgumentDescription.hpp @@ -39,7 +39,7 @@ #define ARGUMENTDESCRIPTION_HPP #include -#include "rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { diff --git a/rtt/Attribute.cpp b/rtt/Attribute.cpp index 712762a36..78c8b3cd5 100644 --- a/rtt/Attribute.cpp +++ b/rtt/Attribute.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "Attribute.hpp" -#include "rtt-fwd.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/rtt-fwd.hpp" namespace RTT { diff --git a/rtt/Attribute.hpp b/rtt/Attribute.hpp index 8f6182c21..0aee95b41 100644 --- a/rtt/Attribute.hpp +++ b/rtt/Attribute.hpp @@ -39,9 +39,9 @@ #ifndef ORO_CORELIB_ATTRIBUTE_HPP #define ORO_CORELIB_ATTRIBUTE_HPP -#include "internal/DataSource.hpp" -#include "internal/DataSources.hpp" -#include "base/AttributeBase.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/base/AttributeBase.hpp" namespace RTT { diff --git a/rtt/BufferPolicy.cpp b/rtt/BufferPolicy.cpp index c2ecd5cee..4b8e6d5c4 100644 --- a/rtt/BufferPolicy.cpp +++ b/rtt/BufferPolicy.cpp @@ -26,7 +26,7 @@ * * ***************************************************************************/ -#include "BufferPolicy.hpp" +#include "rtt/BufferPolicy.hpp" #include namespace RTT { diff --git a/rtt/BufferPolicy.hpp b/rtt/BufferPolicy.hpp index e8d4105be..5e4d57ba9 100644 --- a/rtt/BufferPolicy.hpp +++ b/rtt/BufferPolicy.hpp @@ -30,7 +30,7 @@ #ifndef ORO_BUFFER_POLICY_HPP #define ORO_BUFFER_POLICY_HPP -#include "rtt-config.h" +#include "rtt/rtt-config.h" #include namespace RTT { diff --git a/rtt/Component.hpp b/rtt/Component.hpp index 5acaff1f3..34a335315 100644 --- a/rtt/Component.hpp +++ b/rtt/Component.hpp @@ -50,8 +50,8 @@ #include #include #include -#include "rtt-fwd.hpp" -#include "rtt-config.h" +#include "rtt/rtt-fwd.hpp" +#include "rtt/rtt-config.h" namespace RTT { @@ -126,7 +126,7 @@ namespace RTT * You can only use this macro \b once in a .cpp file for the whole shared library \b and * you may \b not link with another component library when using this macro. Use * ORO_CREATE_COMPONENT_LIBRARY if you are in that situation. - * + * * It adds a function 'createComponent', which will return a new instance of * the library's component type and a function 'getComponentType', which returns * the type (namespace::class) name of the component. @@ -153,7 +153,7 @@ extern "C" { \ /** * Use this macro to create a component library which contains all components listed with - * ORO_LIST_COMPONENT_TYPE. + * ORO_LIST_COMPONENT_TYPE. * * It will add to your library an extern "C" function 'createComponentType' which can create a component of * each class added with ORO_LIST_COMPONENT_TYPE. diff --git a/rtt/ConfigurationInterface.cpp b/rtt/ConfigurationInterface.cpp index dde5c1e79..481bdca4a 100644 --- a/rtt/ConfigurationInterface.cpp +++ b/rtt/ConfigurationInterface.cpp @@ -37,8 +37,8 @@ -#include "ConfigurationInterface.hpp" -#include "internal/mystd.hpp" +#include "rtt/ConfigurationInterface.hpp" +#include "rtt/internal/mystd.hpp" #include #include diff --git a/rtt/ConfigurationInterface.hpp b/rtt/ConfigurationInterface.hpp index e378dc85e..82bbefc04 100644 --- a/rtt/ConfigurationInterface.hpp +++ b/rtt/ConfigurationInterface.hpp @@ -41,11 +41,11 @@ #include #include -#include "Attribute.hpp" -#include "internal/DataSources.hpp" -#include "base/DataObjectInterface.hpp" -#include "Property.hpp" -#include "PropertyBag.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/base/DataObjectInterface.hpp" +#include "rtt/Property.hpp" +#include "rtt/PropertyBag.hpp" namespace RTT { diff --git a/rtt/ConnPolicy.cpp b/rtt/ConnPolicy.cpp index 0cd5137a5..35a591efd 100644 --- a/rtt/ConnPolicy.cpp +++ b/rtt/ConnPolicy.cpp @@ -43,9 +43,9 @@ * Author: kaltan */ -#include "ConnPolicy.hpp" -#include "Property.hpp" -#include "PropertyBag.hpp" +#include "rtt/ConnPolicy.hpp" +#include "rtt/Property.hpp" +#include "rtt/PropertyBag.hpp" #include #include diff --git a/rtt/ConnPolicy.hpp b/rtt/ConnPolicy.hpp index 7e4823bfb..aa54b1995 100644 --- a/rtt/ConnPolicy.hpp +++ b/rtt/ConnPolicy.hpp @@ -41,9 +41,9 @@ #include #include -#include "rtt-fwd.hpp" -#include "rtt-config.h" -#include "BufferPolicy.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/rtt-config.h" +#include "rtt/BufferPolicy.hpp" namespace RTT { diff --git a/rtt/DataFlowInterface.cpp b/rtt/DataFlowInterface.cpp index 9714c4ed7..f312a3bfd 100644 --- a/rtt/DataFlowInterface.cpp +++ b/rtt/DataFlowInterface.cpp @@ -36,10 +36,10 @@ ***************************************************************************/ -#include "DataFlowInterface.hpp" -#include "Logger.hpp" -#include "Service.hpp" -#include "TaskContext.hpp" +#include "rtt/DataFlowInterface.hpp" +#include "rtt/Logger.hpp" +#include "rtt/Service.hpp" +#include "rtt/TaskContext.hpp" namespace RTT { diff --git a/rtt/DataFlowInterface.hpp b/rtt/DataFlowInterface.hpp index 15734b64b..067bc6d6a 100644 --- a/rtt/DataFlowInterface.hpp +++ b/rtt/DataFlowInterface.hpp @@ -42,9 +42,9 @@ #include #include #include -#include "base/InputPortInterface.hpp" -#include "base/OutputPortInterface.hpp" -#include "rtt-fwd.hpp" +#include "rtt/base/InputPortInterface.hpp" +#include "rtt/base/OutputPortInterface.hpp" +#include "rtt/rtt-fwd.hpp" #include namespace RTT diff --git a/rtt/ExecutionEngine.cpp b/rtt/ExecutionEngine.cpp index 5f69a809c..e2cd337e1 100644 --- a/rtt/ExecutionEngine.cpp +++ b/rtt/ExecutionEngine.cpp @@ -37,16 +37,16 @@ -#include "Logger.hpp" -#include "ExecutionEngine.hpp" -#include "base/TaskCore.hpp" -#include "rtt-fwd.hpp" -#include "os/MutexLock.hpp" -#include "internal/MWSRQueue.hpp" -#include "TaskContext.hpp" -#include "internal/CatchConfig.hpp" -#include "extras/SlaveActivity.hpp" -#include "os/traces.h" +#include "rtt/Logger.hpp" +#include "rtt/ExecutionEngine.hpp" +#include "rtt/base/TaskCore.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/internal/MWSRQueue.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/internal/CatchConfig.hpp" +#include "rtt/extras/SlaveActivity.hpp" +#include "rtt/os/traces.h" #include #include diff --git a/rtt/ExecutionEngine.hpp b/rtt/ExecutionEngine.hpp index 725172674..e58d9ee60 100644 --- a/rtt/ExecutionEngine.hpp +++ b/rtt/ExecutionEngine.hpp @@ -39,19 +39,19 @@ #ifndef ORO_EXECUTION_ENGINE_HPP #define ORO_EXECUTION_ENGINE_HPP -#include "os/Mutex.hpp" -#include "os/MutexLock.hpp" -#include "os/Condition.hpp" -#include "base/RunnableInterface.hpp" -#include "base/ActivityInterface.hpp" -#include "base/DisposableInterface.hpp" -#include "base/ExecutableInterface.hpp" -#include "internal/List.hpp" +#include "rtt/os/Mutex.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/os/Condition.hpp" +#include "rtt/base/RunnableInterface.hpp" +#include "rtt/base/ActivityInterface.hpp" +#include "rtt/base/DisposableInterface.hpp" +#include "rtt/base/ExecutableInterface.hpp" +#include "rtt/internal/List.hpp" #include #include -#include "rtt-config.h" -#include "internal/rtt-internal-fwd.hpp" +#include "rtt/rtt-config.h" +#include "rtt/internal/rtt-internal-fwd.hpp" namespace RTT { diff --git a/rtt/FactoryExceptions.cpp b/rtt/FactoryExceptions.cpp index 151aead98..ee65958af 100644 --- a/rtt/FactoryExceptions.cpp +++ b/rtt/FactoryExceptions.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "FactoryExceptions.hpp" +#include "rtt/FactoryExceptions.hpp" #include namespace RTT { diff --git a/rtt/FactoryExceptions.hpp b/rtt/FactoryExceptions.hpp index a5dc3d354..ebb38e391 100644 --- a/rtt/FactoryExceptions.hpp +++ b/rtt/FactoryExceptions.hpp @@ -40,7 +40,7 @@ #include #include -#include "rtt-config.h" +#include "rtt/rtt-config.h" /** * \file FactoryExceptions.hpp This file contains some structs that can be thrown by both diff --git a/rtt/FlowStatus.cpp b/rtt/FlowStatus.cpp index 2060bc4cd..f4e7dc877 100644 --- a/rtt/FlowStatus.cpp +++ b/rtt/FlowStatus.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "FlowStatus.hpp" +#include "rtt/FlowStatus.hpp" #include using namespace std; diff --git a/rtt/FlowStatus.hpp b/rtt/FlowStatus.hpp index 107b50886..dda65a6c3 100644 --- a/rtt/FlowStatus.hpp +++ b/rtt/FlowStatus.hpp @@ -42,7 +42,7 @@ #include #include -#include "rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { /** diff --git a/rtt/Handle.cpp b/rtt/Handle.cpp index f11185f06..9dbed325c 100644 --- a/rtt/Handle.cpp +++ b/rtt/Handle.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "Handle.hpp" -#include "rtt-fwd.hpp" +#include "rtt/Handle.hpp" +#include "rtt/rtt-fwd.hpp" namespace RTT { diff --git a/rtt/Handle.hpp b/rtt/Handle.hpp index aa62ccb5e..d7378a60f 100644 --- a/rtt/Handle.hpp +++ b/rtt/Handle.hpp @@ -39,7 +39,7 @@ #ifndef ORO_CORELIB_SIGNAL_HANDLE_HPP #define ORO_CORELIB_SIGNAL_HANDLE_HPP -#include "internal/SignalBase.hpp" +#include "rtt/internal/SignalBase.hpp" namespace RTT { diff --git a/rtt/InputPort.hpp b/rtt/InputPort.hpp index bf5d305f8..961df8ea8 100644 --- a/rtt/InputPort.hpp +++ b/rtt/InputPort.hpp @@ -39,13 +39,13 @@ #ifndef ORO_INPUT_PORT_HPP #define ORO_INPUT_PORT_HPP -#include "base/InputPortInterface.hpp" -#include "internal/Channels.hpp" -#include "internal/InputPortSource.hpp" -#include "Service.hpp" -#include "OperationCaller.hpp" +#include "rtt/base/InputPortInterface.hpp" +#include "rtt/internal/Channels.hpp" +#include "rtt/internal/InputPortSource.hpp" +#include "rtt/Service.hpp" +#include "rtt/OperationCaller.hpp" -#include "OutputPort.hpp" +#include "rtt/OutputPort.hpp" namespace RTT { diff --git a/rtt/Logger.cpp b/rtt/Logger.cpp index 3cb1ea63f..8091a0731 100644 --- a/rtt/Logger.cpp +++ b/rtt/Logger.cpp @@ -37,12 +37,12 @@ // to retrieve RTAI version, if any. //#define OROBLD_OS_LXRT_INTERNAL -#include "os/StartStopManager.hpp" -#include "os/MutexLock.hpp" -#include "os/Mutex.hpp" -#include "os/TimeService.hpp" +#include "rtt/os/StartStopManager.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/os/Mutex.hpp" +#include "rtt/os/TimeService.hpp" -#include "Logger.hpp" +#include "rtt/Logger.hpp" #include #ifdef OROSEM_PRINTF_LOGGING @@ -57,13 +57,13 @@ # endif # endif # ifdef OROSEM_REMOTE_LOGGING -# include "base/BufferLockFree.hpp" +#include "rtt/base/BufferLockFree.hpp" # endif #endif #include -#include "rtt-config.h" -#include "rtt-fwd.hpp" +#include "rtt/rtt-config.h" +#include "rtt/rtt-fwd.hpp" namespace RTT { diff --git a/rtt/Logger.hpp b/rtt/Logger.hpp index 1890dc092..80138bbae 100644 --- a/rtt/Logger.hpp +++ b/rtt/Logger.hpp @@ -39,7 +39,7 @@ #ifndef ORO_CORELIB_lOGGER_HPP #define ORO_CORELIB_lOGGER_HPP -#include "rtt-config.h" +#include "rtt/rtt-config.h" #ifndef OROBLD_DISABLE_LOGGING #include #include @@ -51,9 +51,9 @@ #include // for std::cerr #endif -#include "os/TimeService.hpp" -#include "os/Mutex.hpp" -#include "os/MutexLock.hpp" +#include "rtt/os/TimeService.hpp" +#include "rtt/os/Mutex.hpp" +#include "rtt/os/MutexLock.hpp" namespace RTT { @@ -381,6 +381,6 @@ namespace RTT static inline Logger::LogFunction flushlog() {return Logger::flush; } } -#include "Logger.inl" +#include "rtt/Logger.inl" #endif diff --git a/rtt/Operation.cpp b/rtt/Operation.cpp index 76dc686f2..8a3d21fe4 100644 --- a/rtt/Operation.cpp +++ b/rtt/Operation.cpp @@ -43,5 +43,5 @@ * Author: kaltan */ -#include "Operation.hpp" +#include "rtt/Operation.hpp" diff --git a/rtt/Operation.hpp b/rtt/Operation.hpp index e2d210642..14a707f5d 100644 --- a/rtt/Operation.hpp +++ b/rtt/Operation.hpp @@ -42,12 +42,12 @@ #include #include #include -#include "base/OperationBase.hpp" -#include "internal/LocalOperationCaller.hpp" +#include "rtt/base/OperationBase.hpp" +#include "rtt/internal/LocalOperationCaller.hpp" #ifdef ORO_SIGNALLING_OPERATIONS -#include "internal/Signal.hpp" +#include "rtt/internal/Signal.hpp" #endif -#include "internal/OperationCallerBinder.hpp" +#include "rtt/internal/OperationCallerBinder.hpp" namespace RTT { diff --git a/rtt/OperationCaller.hpp b/rtt/OperationCaller.hpp index f08be67e5..ee6243901 100644 --- a/rtt/OperationCaller.hpp +++ b/rtt/OperationCaller.hpp @@ -41,18 +41,18 @@ #include #include -#include "base/OperationCallerBase.hpp" +#include "rtt/base/OperationCallerBase.hpp" #ifdef ORO_TEST_OPERATION_CALLER -#include "internal/UnMember.hpp" -#include "internal/LocalOperationCaller.hpp" +#include "rtt/internal/UnMember.hpp" +#include "rtt/internal/LocalOperationCaller.hpp" #endif -#include "internal/InvokerSignature.hpp" -#include "base/OperationCallerBaseInvoker.hpp" -#include "Logger.hpp" -#include "Service.hpp" +#include "rtt/internal/InvokerSignature.hpp" +#include "rtt/base/OperationCallerBaseInvoker.hpp" +#include "rtt/Logger.hpp" +#include "rtt/Service.hpp" #ifdef ORO_REMOTING -#include "OperationInterface.hpp" -#include "internal/RemoteOperationCaller.hpp" +#include "rtt/OperationInterface.hpp" +#include "rtt/internal/RemoteOperationCaller.hpp" #endif namespace RTT diff --git a/rtt/OperationInterface.cpp b/rtt/OperationInterface.cpp index fffc18c0a..b3397d605 100644 --- a/rtt/OperationInterface.cpp +++ b/rtt/OperationInterface.cpp @@ -36,12 +36,12 @@ ***************************************************************************/ -#include "OperationInterface.hpp" -#include "FactoryExceptions.hpp" +#include "rtt/OperationInterface.hpp" +#include "rtt/FactoryExceptions.hpp" #include -#include "internal/mystd.hpp" -#include "internal/Exceptions.hpp" -#include "Handle.hpp" +#include "rtt/internal/mystd.hpp" +#include "rtt/internal/Exceptions.hpp" +#include "rtt/Handle.hpp" using namespace RTT; using namespace RTT::detail; diff --git a/rtt/OperationInterface.hpp b/rtt/OperationInterface.hpp index 3cb167b17..6f4628f24 100644 --- a/rtt/OperationInterface.hpp +++ b/rtt/OperationInterface.hpp @@ -43,12 +43,12 @@ #include #include -#include "rtt-config.h" -#include "base/DataSourceBase.hpp" -#include "internal/DataSource.hpp" -#include "ArgumentDescription.hpp" -#include "FactoryExceptions.hpp" -#include "OperationInterfacePart.hpp" +#include "rtt/rtt-config.h" +#include "rtt/base/DataSourceBase.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/ArgumentDescription.hpp" +#include "rtt/FactoryExceptions.hpp" +#include "rtt/OperationInterfacePart.hpp" namespace RTT diff --git a/rtt/OperationInterfacePart.hpp b/rtt/OperationInterfacePart.hpp index 0acd3fcd8..1482f2fd5 100644 --- a/rtt/OperationInterfacePart.hpp +++ b/rtt/OperationInterfacePart.hpp @@ -42,9 +42,9 @@ #include #include -#include "base/DataSourceBase.hpp" -#include "internal/DataSource.hpp" -#include "ArgumentDescription.hpp" +#include "rtt/base/DataSourceBase.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/ArgumentDescription.hpp" namespace RTT diff --git a/rtt/OutputPort.hpp b/rtt/OutputPort.hpp index 8b96d2af1..08057f0ae 100644 --- a/rtt/OutputPort.hpp +++ b/rtt/OutputPort.hpp @@ -39,15 +39,15 @@ #ifndef ORO_OUTPUT_PORT_HPP #define ORO_OUTPUT_PORT_HPP -#include "base/OutputPortInterface.hpp" -#include "base/DataObject.hpp" -#include "internal/DataObjectDataSource.hpp" -#include "internal/Channels.hpp" -#include "internal/ConnFactory.hpp" -#include "Service.hpp" -#include "OperationCaller.hpp" - -#include "InputPort.hpp" +#include "rtt/base/OutputPortInterface.hpp" +#include "rtt/base/DataObject.hpp" +#include "rtt/internal/DataObjectDataSource.hpp" +#include "rtt/internal/Channels.hpp" +#include "rtt/internal/ConnFactory.hpp" +#include "rtt/Service.hpp" +#include "rtt/OperationCaller.hpp" + +#include "rtt/InputPort.hpp" namespace RTT { diff --git a/rtt/Port.hpp b/rtt/Port.hpp index 9ec370ca3..8a28fd5fb 100644 --- a/rtt/Port.hpp +++ b/rtt/Port.hpp @@ -48,5 +48,5 @@ * class. */ -#include "InputPort.hpp" -#include "OutputPort.hpp" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" diff --git a/rtt/Property.cpp b/rtt/Property.cpp index aa32fc162..0ba20fad0 100644 --- a/rtt/Property.cpp +++ b/rtt/Property.cpp @@ -38,8 +38,8 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "Property.hpp" -#include "base/PropertyIntrospection.hpp" +#include "rtt/Property.hpp" +#include "rtt/base/PropertyIntrospection.hpp" namespace RTT { using namespace detail; diff --git a/rtt/Property.hpp b/rtt/Property.hpp index 0fcf82c2b..249e13d73 100644 --- a/rtt/Property.hpp +++ b/rtt/Property.hpp @@ -38,13 +38,13 @@ #ifndef ORO_PROPERTY_HPP #define ORO_PROPERTY_HPP -#include "rtt-config.h" -#include "base/PropertyBase.hpp" -#include "PropertyBag.hpp" -#include "internal/DataSources.hpp" +#include "rtt/rtt-config.h" +#include "rtt/base/PropertyBase.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/internal/DataSources.hpp" #include #include -#include "Logger.hpp" +#include "rtt/Logger.hpp" #include #include @@ -479,7 +479,7 @@ namespace RTT } } -#include "base/PropertyIntrospection.hpp" +#include "rtt/base/PropertyIntrospection.hpp" namespace RTT { diff --git a/rtt/PropertyBag.cpp b/rtt/PropertyBag.cpp index 1496f59ac..7d157879b 100644 --- a/rtt/PropertyBag.cpp +++ b/rtt/PropertyBag.cpp @@ -38,13 +38,13 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "PropertyBag.hpp" -#include "Property.hpp" -#include "types/PropertyDecomposition.hpp" -#include "types/Types.hpp" -#include "Logger.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/Property.hpp" +#include "rtt/types/PropertyDecomposition.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/Logger.hpp" #include -#include "rtt-fwd.hpp" +#include "rtt/rtt-fwd.hpp" #include diff --git a/rtt/PropertyBag.hpp b/rtt/PropertyBag.hpp index a49ae35b6..c2059240c 100644 --- a/rtt/PropertyBag.hpp +++ b/rtt/PropertyBag.hpp @@ -38,7 +38,7 @@ #ifndef PI_PROPERTY_BAG #define PI_PROPERTY_BAG -#include "base/PropertyBase.hpp" +#include "rtt/base/PropertyBase.hpp" #include #include diff --git a/rtt/RTT.hpp b/rtt/RTT.hpp index ab925f4f2..7a4221429 100644 --- a/rtt/RTT.hpp +++ b/rtt/RTT.hpp @@ -35,7 +35,7 @@ * * ***************************************************************************/ -#include "rtt-config.h" +#include "rtt/rtt-config.h" /** * @file RTT.hpp @@ -49,14 +49,14 @@ */ namespace RTT {} -#include "rtt-fwd.hpp" -#include "TaskContext.hpp" -#include "Activity.hpp" -#include "OperationCaller.hpp" -#include "Operation.hpp" -#include "Property.hpp" -#include "Attribute.hpp" -#include "Port.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/Activity.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Operation.hpp" +#include "rtt/Property.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/Port.hpp" #ifndef DOXYGEN namespace BFL { diff --git a/rtt/SendHandle.hpp b/rtt/SendHandle.hpp index 5eb8d08d7..0066dd938 100644 --- a/rtt/SendHandle.hpp +++ b/rtt/SendHandle.hpp @@ -39,12 +39,12 @@ #ifndef ORO_CORELIB_SEND_HANDLE_HPP #define ORO_CORELIB_SEND_HANDLE_HPP -#include "rtt-config.h" -#include "Logger.hpp" -#include "internal/CollectSignature.hpp" -#include "internal/CollectBase.hpp" -#include "internal/ReturnSignature.hpp" -#include "internal/ReturnBase.hpp" +#include "rtt/rtt-config.h" +#include "rtt/Logger.hpp" +#include "rtt/internal/CollectSignature.hpp" +#include "rtt/internal/CollectBase.hpp" +#include "rtt/internal/ReturnSignature.hpp" +#include "rtt/internal/ReturnBase.hpp" #include namespace RTT diff --git a/rtt/SendStatus.cpp b/rtt/SendStatus.cpp index b904819af..c966d47d1 100644 --- a/rtt/SendStatus.cpp +++ b/rtt/SendStatus.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "SendStatus.hpp" +#include "rtt/SendStatus.hpp" #include diff --git a/rtt/SendStatus.hpp b/rtt/SendStatus.hpp index a1f17d69b..afd5549e8 100644 --- a/rtt/SendStatus.hpp +++ b/rtt/SendStatus.hpp @@ -40,7 +40,7 @@ #ifndef SENDSTATUS_HPP_ #define SENDSTATUS_HPP_ -#include "rtt-config.h" +#include "rtt/rtt-config.h" #include #include diff --git a/rtt/Service.cpp b/rtt/Service.cpp index 498b74b3c..52837aeca 100644 --- a/rtt/Service.cpp +++ b/rtt/Service.cpp @@ -36,10 +36,10 @@ ***************************************************************************/ -#include "Service.hpp" -#include "TaskContext.hpp" +#include "rtt/Service.hpp" +#include "rtt/TaskContext.hpp" #include -#include "internal/mystd.hpp" +#include "rtt/internal/mystd.hpp" #include namespace RTT { diff --git a/rtt/Service.hpp b/rtt/Service.hpp index dff4d6c8a..f124a0183 100644 --- a/rtt/Service.hpp +++ b/rtt/Service.hpp @@ -39,17 +39,17 @@ #ifndef ORO_SERVICE_PROVIDER_HPP #define ORO_SERVICE_PROVIDER_HPP -#include "rtt-config.h" -#include "OperationInterface.hpp" -#include "DataFlowInterface.hpp" -#include "internal/OperationInterfacePartFused.hpp" -#include "internal/LocalOperationCaller.hpp" -#include "internal/OperationCallerC.hpp" -#include "internal/UnMember.hpp" -#include "internal/GetSignature.hpp" - -#include "ConfigurationInterface.hpp" -#include "Operation.hpp" +#include "rtt/rtt-config.h" +#include "rtt/OperationInterface.hpp" +#include "rtt/DataFlowInterface.hpp" +#include "rtt/internal/OperationInterfacePartFused.hpp" +#include "rtt/internal/LocalOperationCaller.hpp" +#include "rtt/internal/OperationCallerC.hpp" +#include "rtt/internal/UnMember.hpp" +#include "rtt/internal/GetSignature.hpp" + +#include "rtt/ConfigurationInterface.hpp" +#include "rtt/Operation.hpp" #include #include #include @@ -187,7 +187,7 @@ namespace RTT /** * Return the execution engine of this service owner. * \see getOwner - */ + */ ExecutionEngine* getOwnerExecutionEngine() const; /** diff --git a/rtt/ServiceRequester.cpp b/rtt/ServiceRequester.cpp index 273c77b17..26f528fb9 100644 --- a/rtt/ServiceRequester.cpp +++ b/rtt/ServiceRequester.cpp @@ -36,11 +36,11 @@ ***************************************************************************/ -#include "ServiceRequester.hpp" -#include "Service.hpp" -#include "internal/mystd.hpp" -#include "Logger.hpp" -#include "TaskContext.hpp" +#include "rtt/ServiceRequester.hpp" +#include "rtt/Service.hpp" +#include "rtt/internal/mystd.hpp" +#include "rtt/Logger.hpp" +#include "rtt/TaskContext.hpp" #include #include diff --git a/rtt/ServiceRequester.hpp b/rtt/ServiceRequester.hpp index dbdb91e34..556599fc0 100644 --- a/rtt/ServiceRequester.hpp +++ b/rtt/ServiceRequester.hpp @@ -39,10 +39,10 @@ #ifndef ORO_SERVICEREQUESTER_HPP_ #define ORO_SERVICEREQUESTER_HPP_ -#include "rtt-config.h" -#include "rtt-fwd.hpp" -#include "base/OperationCallerBaseInvoker.hpp" -#include "Service.hpp" +#include "rtt/rtt-config.h" +#include "rtt/rtt-fwd.hpp" +#include "rtt/base/OperationCallerBaseInvoker.hpp" +#include "rtt/Service.hpp" #include #include #include diff --git a/rtt/TaskContext.cpp b/rtt/TaskContext.cpp index 6b8127f1a..7f50e5662 100644 --- a/rtt/TaskContext.cpp +++ b/rtt/TaskContext.cpp @@ -37,9 +37,9 @@ -#include "TaskContext.hpp" -#include "base/ActionInterface.hpp" -#include "plugin/PluginLoader.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/base/ActionInterface.hpp" +#include "rtt/plugin/PluginLoader.hpp" #include #include @@ -47,17 +47,17 @@ #include #include -#include "internal/DataSource.hpp" -#include "internal/mystd.hpp" -#include "internal/MWSRQueue.hpp" -#include "OperationCaller.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/internal/mystd.hpp" +#include "rtt/internal/MWSRQueue.hpp" +#include "rtt/OperationCaller.hpp" -#include "rtt-config.h" +#include "rtt/rtt-config.h" #if defined(ORO_ACT_DEFAULT_SEQUENTIAL) -#include "extras/SequentialActivity.hpp" +#include "rtt/extras/SequentialActivity.hpp" #elif defined(ORO_ACT_DEFAULT_ACTIVITY) -#include "Activity.hpp" +#include "rtt/Activity.hpp" #endif namespace RTT diff --git a/rtt/TaskContext.hpp b/rtt/TaskContext.hpp index 47dc086b2..464ef3f38 100644 --- a/rtt/TaskContext.hpp +++ b/rtt/TaskContext.hpp @@ -40,12 +40,12 @@ #define ORO_TASK_CONTEXT_HPP -#include "rtt-config.h" -#include "Service.hpp" -#include "ServiceRequester.hpp" -#include "DataFlowInterface.hpp" -#include "ExecutionEngine.hpp" -#include "base/TaskCore.hpp" +#include "rtt/rtt-config.h" +#include "rtt/Service.hpp" +#include "rtt/ServiceRequester.hpp" +#include "rtt/DataFlowInterface.hpp" +#include "rtt/ExecutionEngine.hpp" +#include "rtt/base/TaskCore.hpp" #include #include diff --git a/rtt/Time.hpp b/rtt/Time.hpp index 8ea885bd7..914dbf56f 100644 --- a/rtt/Time.hpp +++ b/rtt/Time.hpp @@ -38,7 +38,7 @@ #ifndef ORO_CORELIB_TIME_HPP #define ORO_CORELIB_TIME_HPP -#include "os/Time.hpp" +#include "rtt/os/Time.hpp" /** * @defgroup CoreLibTime Time measurement classes. diff --git a/rtt/base/ActionInterface.cpp b/rtt/base/ActionInterface.cpp index d2e0f3947..51a6ebd1b 100644 --- a/rtt/base/ActionInterface.cpp +++ b/rtt/base/ActionInterface.cpp @@ -39,8 +39,8 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "ActionInterface.hpp" -#include "rtt-fwd.hpp" +#include "rtt/base/ActionInterface.hpp" +#include "rtt/rtt-fwd.hpp" namespace RTT { using namespace detail; diff --git a/rtt/base/ActionInterface.hpp b/rtt/base/ActionInterface.hpp index fbec70d6e..a6de0ca55 100644 --- a/rtt/base/ActionInterface.hpp +++ b/rtt/base/ActionInterface.hpp @@ -40,8 +40,8 @@ #include #include -#include "../rtt-config.h" -#include "rtt-base-fwd.hpp" +#include "rtt/rtt-config.h" +#include "rtt/base/rtt-base-fwd.hpp" #ifdef ORO_PRAGMA_INTERFACE #pragma interface diff --git a/rtt/base/ActivityInterface.cpp b/rtt/base/ActivityInterface.cpp index 8ee59b66e..683a0f4c7 100644 --- a/rtt/base/ActivityInterface.cpp +++ b/rtt/base/ActivityInterface.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "ActivityInterface.hpp" -#include "RunnableInterface.hpp" +#include "rtt/base/ActivityInterface.hpp" +#include "rtt/base/RunnableInterface.hpp" using namespace RTT; using namespace RTT::base; diff --git a/rtt/base/ActivityInterface.hpp b/rtt/base/ActivityInterface.hpp index b91ad7f66..9edc9e774 100644 --- a/rtt/base/ActivityInterface.hpp +++ b/rtt/base/ActivityInterface.hpp @@ -38,10 +38,10 @@ #ifndef ORO_ACTIVITY_INTERFACE_HPP #define ORO_ACTIVITY_INTERFACE_HPP -#include "../Time.hpp" -#include "../os/ThreadInterface.hpp" +#include "rtt/Time.hpp" +#include "rtt/os/ThreadInterface.hpp" #include -#include "rtt-base-fwd.hpp" +#include "rtt/base/rtt-base-fwd.hpp" namespace RTT { namespace base { diff --git a/rtt/base/AttributeBase.hpp b/rtt/base/AttributeBase.hpp index f6cbef405..543c446d7 100644 --- a/rtt/base/AttributeBase.hpp +++ b/rtt/base/AttributeBase.hpp @@ -39,7 +39,7 @@ #ifndef ORO_ATTRIBUTE_BASE_HPP #define ORO_ATTRIBUTE_BASE_HPP -#include "DataSourceBase.hpp" +#include "rtt/base/DataSourceBase.hpp" namespace RTT { namespace base { diff --git a/rtt/base/Buffer.hpp b/rtt/base/Buffer.hpp index ea767de75..6ca4cbc39 100644 --- a/rtt/base/Buffer.hpp +++ b/rtt/base/Buffer.hpp @@ -40,7 +40,7 @@ #ifndef ORO_BUFFER_HPP #define ORO_BUFFER_HPP -#include "../rtt-config.h" +#include "rtt/rtt-config.h" /** * @file Buffer.hpp @@ -49,10 +49,10 @@ * parameters. */ #if defined(OROBLD_OS_NO_ASM) -#include "BufferLocked.hpp" +#include "rtt/base/BufferLocked.hpp" #else -#include "BufferLocked.hpp" -#include "BufferLockFree.hpp" +#include "rtt/base/BufferLocked.hpp" +#include "rtt/base/BufferLockFree.hpp" #endif namespace RTT diff --git a/rtt/base/BufferBase.cpp b/rtt/base/BufferBase.cpp index c9d472c20..6f15ee709 100644 --- a/rtt/base/BufferBase.cpp +++ b/rtt/base/BufferBase.cpp @@ -37,8 +37,8 @@ -#include "BufferBase.hpp" -#include "../ConnPolicy.hpp" +#include "rtt/base/BufferBase.hpp" +#include "rtt/ConnPolicy.hpp" using namespace RTT; using namespace RTT::base; diff --git a/rtt/base/BufferBase.hpp b/rtt/base/BufferBase.hpp index e2295b89a..e6a161075 100644 --- a/rtt/base/BufferBase.hpp +++ b/rtt/base/BufferBase.hpp @@ -39,8 +39,8 @@ #define ORO_CORELIB_BUFFERBASE_HPP #include -#include "../rtt-config.h" -#include "../rtt-fwd.hpp" +#include "rtt/rtt-config.h" +#include "rtt/rtt-fwd.hpp" namespace RTT { namespace base { diff --git a/rtt/base/BufferInterface.hpp b/rtt/base/BufferInterface.hpp index 8094f5559..c3f0b1b31 100644 --- a/rtt/base/BufferInterface.hpp +++ b/rtt/base/BufferInterface.hpp @@ -38,8 +38,8 @@ #ifndef ORO_CORELIB_BUFFERINTERFACE_HPP #define ORO_CORELIB_BUFFERINTERFACE_HPP -#include "BufferBase.hpp" -#include "../FlowStatus.hpp" +#include "rtt/base/BufferBase.hpp" +#include "rtt/FlowStatus.hpp" #include #include #include diff --git a/rtt/base/BufferLockFree.cpp b/rtt/base/BufferLockFree.cpp index b9a88398c..607278f08 100644 --- a/rtt/base/BufferLockFree.cpp +++ b/rtt/base/BufferLockFree.cpp @@ -40,7 +40,7 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "BufferLockFree.hpp" +#include "rtt/base/BufferLockFree.hpp" namespace RTT { namespace base { diff --git a/rtt/base/BufferLockFree.hpp b/rtt/base/BufferLockFree.hpp index 9613ff570..07ec12fd2 100644 --- a/rtt/base/BufferLockFree.hpp +++ b/rtt/base/BufferLockFree.hpp @@ -38,13 +38,13 @@ #ifndef ORO_BUFFER_LOCK_FREE_HPP #define ORO_BUFFER_LOCK_FREE_HPP -#include "../os/oro_arch.h" -#include "../os/Atomic.hpp" -#include "../os/CAS.hpp" -#include "BufferInterface.hpp" -#include "../internal/AtomicMWSRQueue.hpp" -#include "../internal/AtomicMWMRQueue.hpp" -#include "../internal/TsPool.hpp" +#include "rtt/os/oro_arch.h" +#include "rtt/os/Atomic.hpp" +#include "rtt/os/CAS.hpp" +#include "rtt/base/BufferInterface.hpp" +#include "rtt/internal/AtomicMWSRQueue.hpp" +#include "rtt/internal/AtomicMWMRQueue.hpp" +#include "rtt/internal/TsPool.hpp" #include #ifdef ORO_PRAGMA_INTERFACE diff --git a/rtt/base/BufferLocked.hpp b/rtt/base/BufferLocked.hpp index 535fcbf15..202930837 100644 --- a/rtt/base/BufferLocked.hpp +++ b/rtt/base/BufferLocked.hpp @@ -42,9 +42,9 @@ #ifndef ORO_CORELIB_BUFFER_LOCKED_HPP #define ORO_CORELIB_BUFFER_LOCKED_HPP -#include "../os/Mutex.hpp" -#include "../os/MutexLock.hpp" -#include "BufferInterface.hpp" +#include "rtt/os/Mutex.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/base/BufferInterface.hpp" #include namespace RTT diff --git a/rtt/base/BufferUnSync.hpp b/rtt/base/BufferUnSync.hpp index d19f19a57..48ca85b38 100644 --- a/rtt/base/BufferUnSync.hpp +++ b/rtt/base/BufferUnSync.hpp @@ -40,7 +40,7 @@ #ifndef ORO_CORELIB_BUFFER_UNSYNC_HPP #define ORO_CORELIB_BUFFER_UNSYNC_HPP -#include "BufferInterface.hpp" +#include "rtt/base/BufferInterface.hpp" #include namespace RTT diff --git a/rtt/base/Buffers.hpp b/rtt/base/Buffers.hpp index f2d5052ef..77689af97 100644 --- a/rtt/base/Buffers.hpp +++ b/rtt/base/Buffers.hpp @@ -48,9 +48,9 @@ * such as Buffers and DataObjects. */ -#include "Buffer.hpp" -#include "BufferLocked.hpp" -#include "BufferLockFree.hpp" -#include "DataObject.hpp" -#include "DataObjectLockFree.hpp" -#include "DataObjectLocked.hpp" +#include "rtt/base/Buffer.hpp" +#include "rtt/base/BufferLocked.hpp" +#include "rtt/base/BufferLockFree.hpp" +#include "rtt/base/DataObject.hpp" +#include "rtt/base/DataObjectLockFree.hpp" +#include "rtt/base/DataObjectLocked.hpp" diff --git a/rtt/base/ChannelElement.hpp b/rtt/base/ChannelElement.hpp index 7c27021e6..455e472db 100644 --- a/rtt/base/ChannelElement.hpp +++ b/rtt/base/ChannelElement.hpp @@ -41,10 +41,10 @@ #include #include -#include "ChannelElementBase.hpp" -#include "../ConnPolicy.hpp" -#include "../FlowStatus.hpp" -#include "../os/MutexLock.hpp" +#include "rtt/base/ChannelElementBase.hpp" +#include "rtt/ConnPolicy.hpp" +#include "rtt/FlowStatus.hpp" +#include "rtt/os/MutexLock.hpp" #include diff --git a/rtt/base/ChannelElementBase.hpp b/rtt/base/ChannelElementBase.hpp index 76aa88f35..44a4dbec6 100644 --- a/rtt/base/ChannelElementBase.hpp +++ b/rtt/base/ChannelElementBase.hpp @@ -39,16 +39,16 @@ #ifndef ORO_CHANNEL_BASE_HPP #define ORO_CHANNEL_BASE_HPP -#include "../os/oro_arch.h" +#include "rtt/os/oro_arch.h" #include #include #include -#include "../rtt-fwd.hpp" -#include "rtt-base-fwd.hpp" -#include "../internal/rtt-internal-fwd.hpp" -#include "../BufferPolicy.hpp" -#include "../os/Mutex.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/base/rtt-base-fwd.hpp" +#include "rtt/internal/rtt-internal-fwd.hpp" +#include "rtt/BufferPolicy.hpp" +#include "rtt/os/Mutex.hpp" #include #include diff --git a/rtt/base/ChannelInterface.cpp b/rtt/base/ChannelInterface.cpp index a70453561..724502672 100644 --- a/rtt/base/ChannelInterface.cpp +++ b/rtt/base/ChannelInterface.cpp @@ -36,9 +36,9 @@ ***************************************************************************/ -#include "../internal/Channels.hpp" -#include "../os/Atomic.hpp" -#include "../os/MutexLock.hpp" +#include "rtt/internal/Channels.hpp" +#include "rtt/os/Atomic.hpp" +#include "rtt/os/MutexLock.hpp" #include using namespace RTT; diff --git a/rtt/base/CoreRunnableInterface.cpp b/rtt/base/CoreRunnableInterface.cpp index fff6a825b..a251e6b7b 100644 --- a/rtt/base/CoreRunnableInterface.cpp +++ b/rtt/base/CoreRunnableInterface.cpp @@ -37,8 +37,8 @@ -#include "RunnableInterface.hpp" -#include "../Logger.hpp" +#include "rtt/base/RunnableInterface.hpp" +#include "rtt/Logger.hpp" #include namespace RTT { diff --git a/rtt/base/DataObject.hpp b/rtt/base/DataObject.hpp index 91a51f22d..d9f54f0bb 100644 --- a/rtt/base/DataObject.hpp +++ b/rtt/base/DataObject.hpp @@ -38,7 +38,7 @@ #ifndef CORELIB_DATAOBJECT_HPP #define CORELIB_DATAOBJECT_HPP -#include "../rtt-config.h" +#include "rtt/rtt-config.h" /** * @file DataObject.hpp @@ -47,10 +47,10 @@ * parameters. */ #if defined(OROBLD_OS_NO_ASM) -#include "DataObjectLocked.hpp" +#include "rtt/base/DataObjectLocked.hpp" #else -#include "DataObjectLocked.hpp" -#include "DataObjectLockFree.hpp" +#include "rtt/base/DataObjectLocked.hpp" +#include "rtt/base/DataObjectLockFree.hpp" #endif namespace RTT diff --git a/rtt/base/DataObjectBase.cpp b/rtt/base/DataObjectBase.cpp index bc2bf8e56..29a763350 100644 --- a/rtt/base/DataObjectBase.cpp +++ b/rtt/base/DataObjectBase.cpp @@ -27,8 +27,8 @@ ***************************************************************************/ -#include "DataObjectBase.hpp" -#include "../ConnPolicy.hpp" +#include "rtt/base/DataObjectBase.hpp" +#include "rtt/ConnPolicy.hpp" using namespace RTT; using namespace RTT::base; diff --git a/rtt/base/DataObjectBase.hpp b/rtt/base/DataObjectBase.hpp index 3c832a8f9..009b6fdb0 100644 --- a/rtt/base/DataObjectBase.hpp +++ b/rtt/base/DataObjectBase.hpp @@ -29,7 +29,7 @@ #ifndef CORELIB_DATAOBJECTBASE_HPP #define CORELIB_DATAOBJECTBASE_HPP -#include "../rtt-fwd.hpp" +#include "rtt/rtt-fwd.hpp" namespace RTT { namespace base { diff --git a/rtt/base/DataObjectInterface.hpp b/rtt/base/DataObjectInterface.hpp index c2e1f4f50..589773687 100644 --- a/rtt/base/DataObjectInterface.hpp +++ b/rtt/base/DataObjectInterface.hpp @@ -38,8 +38,8 @@ #ifndef CORELIB_DATAOBJECTINTERFACE_HPP #define CORELIB_DATAOBJECTINTERFACE_HPP -#include "DataObjectBase.hpp" -#include "../FlowStatus.hpp" +#include "rtt/base/DataObjectBase.hpp" +#include "rtt/FlowStatus.hpp" #include #include diff --git a/rtt/base/DataObjectLockFree.hpp b/rtt/base/DataObjectLockFree.hpp index e748b6ba8..118cbc626 100644 --- a/rtt/base/DataObjectLockFree.hpp +++ b/rtt/base/DataObjectLockFree.hpp @@ -39,11 +39,11 @@ #define CORELIB_DATAOBJECT_LOCK_FREE_HPP -#include "../os/oro_arch.h" -#include "DataObjectInterface.hpp" -#include "../Logger.hpp" -#include "../types/Types.hpp" -#include "../internal/DataSourceTypeInfo.hpp" +#include "rtt/os/oro_arch.h" +#include "rtt/base/DataObjectInterface.hpp" +#include "rtt/Logger.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/internal/DataSourceTypeInfo.hpp" namespace RTT { namespace base { diff --git a/rtt/base/DataObjectLocked.hpp b/rtt/base/DataObjectLocked.hpp index d38000108..1996c7211 100644 --- a/rtt/base/DataObjectLocked.hpp +++ b/rtt/base/DataObjectLocked.hpp @@ -39,8 +39,8 @@ #define CORELIB_DATAOBJECT_LOCKED_HPP -#include "../os/MutexLock.hpp" -#include "DataObjectInterface.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/base/DataObjectInterface.hpp" namespace RTT { namespace base { diff --git a/rtt/base/DataObjectUnSync.hpp b/rtt/base/DataObjectUnSync.hpp index 83c2f1233..141f75c2e 100644 --- a/rtt/base/DataObjectUnSync.hpp +++ b/rtt/base/DataObjectUnSync.hpp @@ -41,7 +41,7 @@ #define CORELIB_DATAOBJECT_UNSYNC_HPP -#include "DataObjectInterface.hpp" +#include "rtt/base/DataObjectInterface.hpp" namespace RTT { namespace base { diff --git a/rtt/base/DataSourceBase.hpp b/rtt/base/DataSourceBase.hpp index 0124420a5..f0f6a2183 100644 --- a/rtt/base/DataSourceBase.hpp +++ b/rtt/base/DataSourceBase.hpp @@ -44,10 +44,10 @@ #include #include #include -#include "../os/Atomic.hpp" -#include "../rtt-config.h" -#include "ActionInterface.hpp" -#include "../rtt-fwd.hpp" +#include "rtt/os/Atomic.hpp" +#include "rtt/rtt-config.h" +#include "rtt/base/ActionInterface.hpp" +#include "rtt/rtt-fwd.hpp" namespace RTT { namespace base { diff --git a/rtt/base/DisposableInterface.hpp b/rtt/base/DisposableInterface.hpp index 117048dd3..9682d3674 100644 --- a/rtt/base/DisposableInterface.hpp +++ b/rtt/base/DisposableInterface.hpp @@ -40,7 +40,7 @@ #define ORO_DISPOSABLEINTERFACE_HPP #include -#include "../rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { diff --git a/rtt/base/ExecutableInterface.hpp b/rtt/base/ExecutableInterface.hpp index f85915020..33538d80a 100644 --- a/rtt/base/ExecutableInterface.hpp +++ b/rtt/base/ExecutableInterface.hpp @@ -39,8 +39,8 @@ #ifndef EXECUTABLE_INTERFACE_HPP #define EXECUTABLE_INTERFACE_HPP -#include "../rtt-fwd.hpp" -#include "../rtt-config.h" +#include "rtt/rtt-fwd.hpp" +#include "rtt/rtt-config.h" #include diff --git a/rtt/base/InputPortInterface.cpp b/rtt/base/InputPortInterface.cpp index 503286f2e..e7689c8b4 100644 --- a/rtt/base/InputPortInterface.cpp +++ b/rtt/base/InputPortInterface.cpp @@ -36,16 +36,16 @@ ***************************************************************************/ -#include "PortInterface.hpp" -#include "InputPortInterface.hpp" -#include "OutputPortInterface.hpp" -#include "DataFlowInterface.hpp" -#include "../internal/ConnInputEndPoint.hpp" -#include "../internal/ConnFactory.hpp" -#include "../Logger.hpp" +#include "rtt/base/PortInterface.hpp" +#include "rtt/base/InputPortInterface.hpp" +#include "rtt/base/OutputPortInterface.hpp" +#include "rtt/DataFlowInterface.hpp" +#include "rtt/internal/ConnInputEndPoint.hpp" +#include "rtt/internal/ConnFactory.hpp" +#include "rtt/Logger.hpp" #include #include -#include <../os/traces.h> +#include "rtt/os/traces.h" using namespace RTT; using namespace RTT::detail; diff --git a/rtt/base/InputPortInterface.hpp b/rtt/base/InputPortInterface.hpp index 87aa0cb04..c904a120e 100644 --- a/rtt/base/InputPortInterface.hpp +++ b/rtt/base/InputPortInterface.hpp @@ -40,14 +40,14 @@ #define ORO_INPUT_PORT_INTERFACE_HPP #include -#include "PortInterface.hpp" -#include "ChannelElement.hpp" -#include "../internal/rtt-internal-fwd.hpp" -#include "../internal/ConnectionManager.hpp" +#include "rtt/base/PortInterface.hpp" +#include "rtt/base/ChannelElement.hpp" +#include "rtt/internal/rtt-internal-fwd.hpp" +#include "rtt/internal/ConnectionManager.hpp" #ifdef ORO_SIGNALLING_PORTS -#include "../internal/Signal.hpp" +#include "rtt/internal/Signal.hpp" #endif -#include "../base/DataSourceBase.hpp" +#include "rtt/base/DataSourceBase.hpp" namespace RTT { namespace base { diff --git a/rtt/base/OperationBase.cpp b/rtt/base/OperationBase.cpp index 43eedbbc6..61f1a5fcb 100644 --- a/rtt/base/OperationBase.cpp +++ b/rtt/base/OperationBase.cpp @@ -43,8 +43,8 @@ * Author: kaltan */ -#include "OperationBase.hpp" -#include "Operation.hpp" +#include "rtt/base/OperationBase.hpp" +#include "rtt/Operation.hpp" namespace RTT { diff --git a/rtt/base/OperationBase.hpp b/rtt/base/OperationBase.hpp index f229a6ddd..97ab5594d 100644 --- a/rtt/base/OperationBase.hpp +++ b/rtt/base/OperationBase.hpp @@ -39,12 +39,12 @@ #ifndef ORO_OPERATIONBASE_HPP_ #define ORO_OPERATIONBASE_HPP_ -#include "../rtt-config.h" -#include "../rtt-fwd.hpp" -#include "rtt-base-fwd.hpp" +#include "rtt/rtt-config.h" +#include "rtt/rtt-fwd.hpp" +#include "rtt/base/rtt-base-fwd.hpp" #include #include -#include "DisposableInterface.hpp" +#include "rtt/base/DisposableInterface.hpp" namespace RTT { diff --git a/rtt/base/OperationCallerBase.hpp b/rtt/base/OperationCallerBase.hpp index eb5876048..a699eb42f 100644 --- a/rtt/base/OperationCallerBase.hpp +++ b/rtt/base/OperationCallerBase.hpp @@ -39,9 +39,9 @@ #ifndef ORO_OPERATION_CALLER_BASE_HPP #define ORO_OPERATION_CALLER_BASE_HPP -#include "../rtt-fwd.hpp" -#include "../internal/Invoker.hpp" -#include "OperationCallerInterface.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/internal/Invoker.hpp" +#include "rtt/base/OperationCallerInterface.hpp" #include namespace RTT diff --git a/rtt/base/OperationCallerBaseInvoker.hpp b/rtt/base/OperationCallerBaseInvoker.hpp index e9f2de357..fcde684d9 100644 --- a/rtt/base/OperationCallerBaseInvoker.hpp +++ b/rtt/base/OperationCallerBaseInvoker.hpp @@ -40,8 +40,8 @@ #define ORO_METHODBASEINVOKER_HPP_ #include -#include "DisposableInterface.hpp" -#include "../rtt-fwd.hpp" +#include "rtt/base/DisposableInterface.hpp" +#include "rtt/rtt-fwd.hpp" namespace RTT { diff --git a/rtt/base/OperationCallerInterface.cpp b/rtt/base/OperationCallerInterface.cpp index a64612c5a..fb786049d 100644 --- a/rtt/base/OperationCallerInterface.cpp +++ b/rtt/base/OperationCallerInterface.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "OperationCallerInterface.hpp" -#include "../internal/GlobalEngine.hpp" +#include "rtt/base/OperationCallerInterface.hpp" +#include "rtt/internal/GlobalEngine.hpp" using namespace RTT; using namespace base; diff --git a/rtt/base/OperationCallerInterface.hpp b/rtt/base/OperationCallerInterface.hpp index 69e554d44..39d9b3218 100644 --- a/rtt/base/OperationCallerInterface.hpp +++ b/rtt/base/OperationCallerInterface.hpp @@ -39,9 +39,9 @@ #ifndef ORO_OPERATION_CALLER_INTERFACE_HPP #define ORO_OPERATION_CALLER_INTERFACE_HPP -#include "../rtt-fwd.hpp" -#include "DisposableInterface.hpp" -#include "OperationBase.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/base/DisposableInterface.hpp" +#include "rtt/base/OperationBase.hpp" namespace RTT { diff --git a/rtt/base/OutputPortInterface.cpp b/rtt/base/OutputPortInterface.cpp index 246c27d0a..9e821e129 100644 --- a/rtt/base/OutputPortInterface.cpp +++ b/rtt/base/OutputPortInterface.cpp @@ -36,13 +36,13 @@ ***************************************************************************/ -#include "PortInterface.hpp" -#include "OutputPortInterface.hpp" -#include "InputPortInterface.hpp" -#include "../internal/ConnFactory.hpp" +#include "rtt/base/PortInterface.hpp" +#include "rtt/base/OutputPortInterface.hpp" +#include "rtt/base/InputPortInterface.hpp" +#include "rtt/internal/ConnFactory.hpp" #include #include -#include "../os/traces.h" +#include "rtt/os/traces.h" using namespace RTT; using namespace RTT::detail; diff --git a/rtt/base/OutputPortInterface.hpp b/rtt/base/OutputPortInterface.hpp index 11fa8982a..e5ab06d3e 100644 --- a/rtt/base/OutputPortInterface.hpp +++ b/rtt/base/OutputPortInterface.hpp @@ -39,8 +39,8 @@ #ifndef ORO_OUTPUT_PORT_INTERFACE_HPP #define ORO_OUTPUT_PORT_INTERFACE_HPP -#include "PortInterface.hpp" -#include "DataSourceBase.hpp" +#include "rtt/base/PortInterface.hpp" +#include "rtt/base/DataSourceBase.hpp" namespace RTT { namespace base { diff --git a/rtt/base/PortInterface.cpp b/rtt/base/PortInterface.cpp index b7b0c5d48..903e04c45 100644 --- a/rtt/base/PortInterface.cpp +++ b/rtt/base/PortInterface.cpp @@ -36,11 +36,11 @@ ***************************************************************************/ -#include "PortInterface.hpp" -#include "../Service.hpp" -#include "../OperationCaller.hpp" -#include "../internal/ConnFactory.hpp" -#include "../TaskContext.hpp" +#include "rtt/base/PortInterface.hpp" +#include "rtt/Service.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/internal/ConnFactory.hpp" +#include "rtt/TaskContext.hpp" #include using namespace RTT; diff --git a/rtt/base/PortInterface.hpp b/rtt/base/PortInterface.hpp index 4e7fa9c7b..a251fad1e 100644 --- a/rtt/base/PortInterface.hpp +++ b/rtt/base/PortInterface.hpp @@ -40,14 +40,14 @@ #define ORO_EXECUTION_PORT_INTERFACE_HPP #include -#include "../internal/rtt-internal-fwd.hpp" -#include "../ConnPolicy.hpp" -#include "../internal/ConnectionManager.hpp" -#include "../internal/ConnID.hpp" -#include "ChannelElementBase.hpp" -#include "../types/rtt-types-fwd.hpp" -#include "../os/Mutex.hpp" -#include "../rtt-fwd.hpp" +#include "rtt/internal/rtt-internal-fwd.hpp" +#include "rtt/ConnPolicy.hpp" +#include "rtt/internal/ConnectionManager.hpp" +#include "rtt/internal/ConnID.hpp" +#include "rtt/base/ChannelElementBase.hpp" +#include "rtt/types/rtt-types-fwd.hpp" +#include "rtt/os/Mutex.hpp" +#include "rtt/rtt-fwd.hpp" namespace RTT { namespace base { diff --git a/rtt/base/PropertyBagVisitor.cpp b/rtt/base/PropertyBagVisitor.cpp index 69455be67..a7a8c9c70 100644 --- a/rtt/base/PropertyBagVisitor.cpp +++ b/rtt/base/PropertyBagVisitor.cpp @@ -36,12 +36,12 @@ ***************************************************************************/ -#include "PropertyBagVisitor.hpp" -#include "../types/PropertyDecomposition.hpp" -#include "../types/Types.hpp" -#include "../Property.hpp" -#include "../PropertyBag.hpp" -#include "../Logger.hpp" +#include "rtt/base/PropertyBagVisitor.hpp" +#include "rtt/types/PropertyDecomposition.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/Property.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/Logger.hpp" namespace RTT { using namespace detail; diff --git a/rtt/base/PropertyBagVisitor.hpp b/rtt/base/PropertyBagVisitor.hpp index f52c04e32..93a4104a8 100644 --- a/rtt/base/PropertyBagVisitor.hpp +++ b/rtt/base/PropertyBagVisitor.hpp @@ -38,8 +38,8 @@ #ifndef PI_PROPERTY_BAG_VISITOR_HPP #define PI_PROPERTY_BAG_VISITOR_HPP -#include "../rtt-config.h" -#include "../rtt-fwd.hpp" +#include "rtt/rtt-config.h" +#include "rtt/rtt-fwd.hpp" namespace RTT { namespace base { diff --git a/rtt/base/PropertyBase.cpp b/rtt/base/PropertyBase.cpp index 2a6d7b11d..398ae6d4e 100644 --- a/rtt/base/PropertyBase.cpp +++ b/rtt/base/PropertyBase.cpp @@ -38,10 +38,10 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "PropertyBase.hpp" -#include "internal/DataSources.hpp" -#include "PropertyBag.hpp" -#include "../types/PropertyDecomposition.hpp" +#include "rtt/base/PropertyBase.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/types/PropertyDecomposition.hpp" namespace RTT { using namespace detail; diff --git a/rtt/base/PropertyBase.hpp b/rtt/base/PropertyBase.hpp index 86b85f4f6..947d3229b 100644 --- a/rtt/base/PropertyBase.hpp +++ b/rtt/base/PropertyBase.hpp @@ -39,8 +39,8 @@ #define PI_PROPERTYBASE #include -#include "ActionInterface.hpp" -#include "DataSourceBase.hpp" +#include "rtt/base/ActionInterface.hpp" +#include "rtt/base/DataSourceBase.hpp" #ifdef ORO_PRAGMA_INTERFACE #pragma interface diff --git a/rtt/base/PropertyIntrospection.hpp b/rtt/base/PropertyIntrospection.hpp index 0a3ae24a7..60b0d2c85 100644 --- a/rtt/base/PropertyIntrospection.hpp +++ b/rtt/base/PropertyIntrospection.hpp @@ -39,8 +39,8 @@ #define PI_PROPERTYINTROSPECTION_HPP #include -#include "../rtt-config.h" -#include "PropertyBagVisitor.hpp" +#include "rtt/rtt-config.h" +#include "rtt/base/PropertyBagVisitor.hpp" namespace RTT { namespace base { @@ -142,4 +142,4 @@ namespace RTT }} #endif -#include "PropertyIntrospection.inl" +#include "rtt/base/PropertyIntrospection.inl" diff --git a/rtt/base/PropertyIntrospection.inl b/rtt/base/PropertyIntrospection.inl index 9d57cbceb..f9846dcbd 100644 --- a/rtt/base/PropertyIntrospection.inl +++ b/rtt/base/PropertyIntrospection.inl @@ -38,10 +38,10 @@ #ifndef PI_PROPERTYINTROSPECTION_INL #define PI_PROPERTYINTROSPECTION_INL -#include "PropertyIntrospection.hpp" -#include "../Property.hpp" -#include "../PropertyBag.hpp" -#include "../Logger.hpp" +#include "rtt/base/PropertyIntrospection.hpp" +#include "rtt/Property.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/Logger.hpp" namespace RTT { namespace base { diff --git a/rtt/base/RunnableInterface.hpp b/rtt/base/RunnableInterface.hpp index 6e8dd94ca..0879181cd 100644 --- a/rtt/base/RunnableInterface.hpp +++ b/rtt/base/RunnableInterface.hpp @@ -38,7 +38,7 @@ #ifndef CORELIB_RUNNABLE_INTERFACE_HPP #define CORELIB_RUNNABLE_INTERFACE_HPP -#include "ActivityInterface.hpp" +#include "rtt/base/ActivityInterface.hpp" namespace RTT { namespace base { diff --git a/rtt/base/TaskCore.cpp b/rtt/base/TaskCore.cpp index 4573ea481..edc066d43 100644 --- a/rtt/base/TaskCore.cpp +++ b/rtt/base/TaskCore.cpp @@ -37,12 +37,12 @@ -#include "TaskCore.hpp" -#include "../ExecutionEngine.hpp" -#include "ActivityInterface.hpp" -#include "Logger.hpp" -#include "internal/CatchConfig.hpp" -#include +#include "rtt/base/TaskCore.hpp" +#include "rtt/ExecutionEngine.hpp" +#include "rtt/base/ActivityInterface.hpp" +#include "rtt/Logger.hpp" +#include "rtt/internal/CatchConfig.hpp" +#include "rtt/os/traces.h" #include namespace RTT { diff --git a/rtt/base/TaskCore.hpp b/rtt/base/TaskCore.hpp index 7a741b1c4..3af62d83f 100644 --- a/rtt/base/TaskCore.hpp +++ b/rtt/base/TaskCore.hpp @@ -40,9 +40,9 @@ #define ORO_TASK_CORE_HPP #include -#include "../rtt-fwd.hpp" -#include "../rtt-config.h" -#include "../Time.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/rtt-config.h" +#include "rtt/Time.hpp" namespace RTT { namespace base { diff --git a/rtt/deployment/ComponentLoader.cpp b/rtt/deployment/ComponentLoader.cpp index d7e1e6215..70eb71851 100644 --- a/rtt/deployment/ComponentLoader.cpp +++ b/rtt/deployment/ComponentLoader.cpp @@ -36,17 +36,17 @@ ***************************************************************************/ -#include "ComponentLoader.hpp" -#include -#include +#include "rtt/deployment/ComponentLoader.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/Logger.hpp" #include #include -#include -#include -#include +#include "rtt/os/StartStopManager.hpp" +#include "rtt/plugin/PluginLoader.hpp" +#include "rtt/types/TypekitRepository.hpp" #ifndef _WIN32 -# include +#include "rtt/os/win32/dlfcn.h" #endif #include diff --git a/rtt/deployment/ComponentLoader.hpp b/rtt/deployment/ComponentLoader.hpp index f1b03be5d..38db049c5 100644 --- a/rtt/deployment/ComponentLoader.hpp +++ b/rtt/deployment/ComponentLoader.hpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include "rtt/Component.hpp" namespace RTT { /** diff --git a/rtt/extras/Activities.hpp b/rtt/extras/Activities.hpp index a560d0542..cc03079de 100644 --- a/rtt/extras/Activities.hpp +++ b/rtt/extras/Activities.hpp @@ -46,9 +46,9 @@ * @defgroup CoreLibActivities Activity (thread) classes. * Activities execute functions in a thread. */ -#include "SlaveActivity.hpp" -#include "SequentialActivity.hpp" -#include "PeriodicActivity.hpp" -#include "../Activity.hpp" -#include "../base/RunnableInterface.hpp" +#include "rtt/extras/SlaveActivity.hpp" +#include "rtt/extras/SequentialActivity.hpp" +#include "rtt/extras/PeriodicActivity.hpp" +#include "rtt/Activity.hpp" +#include "rtt/base/RunnableInterface.hpp" diff --git a/rtt/extras/FileDescriptorActivity.cpp b/rtt/extras/FileDescriptorActivity.cpp index 460d8c917..5723a818e 100644 --- a/rtt/extras/FileDescriptorActivity.cpp +++ b/rtt/extras/FileDescriptorActivity.cpp @@ -36,10 +36,10 @@ ***************************************************************************/ -#include "FileDescriptorActivity.hpp" -#include "../ExecutionEngine.hpp" -#include "../base/TaskCore.hpp" -#include "../Logger.hpp" +#include "rtt/extras/FileDescriptorActivity.hpp" +#include "rtt/ExecutionEngine.hpp" +#include "rtt/base/TaskCore.hpp" +#include "rtt/Logger.hpp" #include diff --git a/rtt/extras/FileDescriptorActivity.hpp b/rtt/extras/FileDescriptorActivity.hpp index 0e9ce96f3..4605fad9f 100644 --- a/rtt/extras/FileDescriptorActivity.hpp +++ b/rtt/extras/FileDescriptorActivity.hpp @@ -39,8 +39,8 @@ #ifndef FILEDESCRIPTOR_ACTIVITY_HPP #define FILEDESCRIPTOR_ACTIVITY_HPP -#include "FileDescriptorActivityInterface.hpp" -#include "../Activity.hpp" +#include "rtt/extras/FileDescriptorActivityInterface.hpp" +#include "rtt/Activity.hpp" #include namespace RTT { namespace extras { diff --git a/rtt/extras/FileDescriptorActivityInterface.hpp b/rtt/extras/FileDescriptorActivityInterface.hpp index 9e7f75704..156644c3f 100644 --- a/rtt/extras/FileDescriptorActivityInterface.hpp +++ b/rtt/extras/FileDescriptorActivityInterface.hpp @@ -31,7 +31,7 @@ #ifndef FILEDESCRIPTOR_ACTIVITY_INTERFACE_HPP #define FILEDESCRIPTOR_ACTIVITY_INTERFACE_HPP -#include "../Activity.hpp" +#include "rtt/Activity.hpp" #include namespace RTT { namespace extras { diff --git a/rtt/extras/FileDescriptorSimulationActivity.cpp b/rtt/extras/FileDescriptorSimulationActivity.cpp index 66c8953e8..4b27422bd 100644 --- a/rtt/extras/FileDescriptorSimulationActivity.cpp +++ b/rtt/extras/FileDescriptorSimulationActivity.cpp @@ -28,8 +28,8 @@ * * ***************************************************************************/ -#include "FileDescriptorSimulationActivity.hpp" -#include "os/MainThread.hpp" +#include "rtt/extras/FileDescriptorSimulationActivity.hpp" +#include "rtt/os/MainThread.hpp" using namespace RTT; using namespace extras; diff --git a/rtt/extras/FileDescriptorSimulationActivity.hpp b/rtt/extras/FileDescriptorSimulationActivity.hpp index a110928d8..c2d82d7fb 100644 --- a/rtt/extras/FileDescriptorSimulationActivity.hpp +++ b/rtt/extras/FileDescriptorSimulationActivity.hpp @@ -31,9 +31,9 @@ #ifndef FILEDESCRIPTORSIMULATION_ACTIVITY_HPP #define FILEDESCRIPTORSIMULATION_ACTIVITY_HPP -#include "../base/ActivityInterface.hpp" -#include "../base/RunnableInterface.hpp" -#include "../extras/FileDescriptorActivityInterface.hpp" +#include "rtt/base/ActivityInterface.hpp" +#include "rtt/base/RunnableInterface.hpp" +#include "rtt/extras/FileDescriptorActivityInterface.hpp" namespace RTT { namespace extras { diff --git a/rtt/extras/IRQActivity.cpp b/rtt/extras/IRQActivity.cpp index 1a9500cfe..1b2354286 100644 --- a/rtt/extras/IRQActivity.cpp +++ b/rtt/extras/IRQActivity.cpp @@ -36,10 +36,10 @@ ***************************************************************************/ -#include "IRQActivity.hpp" -#include "../ExecutionEngine.hpp" -#include "../base/TaskCore.hpp" -#include "../Logger.hpp" +#include "rtt/extras/IRQActivity.hpp" +#include "rtt/ExecutionEngine.hpp" +#include "rtt/base/TaskCore.hpp" +#include "rtt/Logger.hpp" #include diff --git a/rtt/extras/IRQActivity.hpp b/rtt/extras/IRQActivity.hpp index 1ef15f6db..e60b19982 100644 --- a/rtt/extras/IRQActivity.hpp +++ b/rtt/extras/IRQActivity.hpp @@ -39,8 +39,8 @@ #ifndef IRQ_ACTIVITY_HPP #define IRQ_ACTIVITY_HPP -#include "../Activity.hpp" -#include "../rtt-config.h" +#include "rtt/Activity.hpp" +#include "rtt/rtt-config.h" #ifdef OROPKG_OS_XENOMAI #include diff --git a/rtt/extras/MultiVector.cpp b/rtt/extras/MultiVector.cpp index cb8b744b8..72d0f4c31 100644 --- a/rtt/extras/MultiVector.cpp +++ b/rtt/extras/MultiVector.cpp @@ -38,7 +38,7 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "MultiVector.hpp" +#include "rtt/extras/MultiVector.hpp" #ifdef __GNUC__ namespace RTT { diff --git a/rtt/extras/MultiVector.hpp b/rtt/extras/MultiVector.hpp index 4eeee35f7..c96764535 100644 --- a/rtt/extras/MultiVector.hpp +++ b/rtt/extras/MultiVector.hpp @@ -39,7 +39,7 @@ #ifndef MULTIVECTOR_HPP #define MULTIVECTOR_HPP -#include "../rtt-config.h" +#include "rtt/rtt-config.h" #include #ifdef OS_HAVE_STREAMS diff --git a/rtt/extras/MultiVectorComposition.hpp b/rtt/extras/MultiVectorComposition.hpp index eb18a7842..644e85fa0 100644 --- a/rtt/extras/MultiVectorComposition.hpp +++ b/rtt/extras/MultiVectorComposition.hpp @@ -40,10 +40,10 @@ #ifndef MULTIVECTOR_COMPOSITION_HPP #define MULTIVECTOR_COMPOSITION_HPP -#include "MultiVector.hpp" -#include "../Property.hpp" -#include "../PropertyBag.hpp" -#include "../Logger.hpp" +#include "rtt/extras/MultiVector.hpp" +#include "rtt/Property.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/Logger.hpp" namespace RTT { namespace extras { diff --git a/rtt/extras/PeriodicActivity.cpp b/rtt/extras/PeriodicActivity.cpp index 57b8209e3..84a87bb43 100644 --- a/rtt/extras/PeriodicActivity.cpp +++ b/rtt/extras/PeriodicActivity.cpp @@ -38,11 +38,11 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "../Time.hpp" -#include "PeriodicActivity.hpp" -#include "../os/MutexLock.hpp" -#include "../Logger.hpp" -#include "TimerThread.hpp" +#include "rtt/Time.hpp" +#include "rtt/extras/PeriodicActivity.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/Logger.hpp" +#include "rtt/extras/TimerThread.hpp" #include namespace RTT { diff --git a/rtt/extras/PeriodicActivity.hpp b/rtt/extras/PeriodicActivity.hpp index 295f3dc6e..9d03cb424 100644 --- a/rtt/extras/PeriodicActivity.hpp +++ b/rtt/extras/PeriodicActivity.hpp @@ -38,11 +38,11 @@ #ifndef ORO_PERIODIC_ACTIVITY_HPP #define ORO_PERIODIC_ACTIVITY_HPP -#include "../base/RunnableInterface.hpp" +#include "rtt/base/RunnableInterface.hpp" -#include "../Time.hpp" -#include "../base/ActivityInterface.hpp" -#include "TimerThread.hpp" +#include "rtt/Time.hpp" +#include "rtt/base/ActivityInterface.hpp" +#include "rtt/extras/TimerThread.hpp" #ifdef ORO_PRAGMA_INTERFACE #pragma interface diff --git a/rtt/extras/Properties.hpp b/rtt/extras/Properties.hpp index f0b7341af..8178df9db 100644 --- a/rtt/extras/Properties.hpp +++ b/rtt/extras/Properties.hpp @@ -51,7 +51,7 @@ * */ -#include "../Property.hpp" -#include "../PropertyBag.hpp" -#include "../base/PropertyIntrospection.hpp" -#include "../marsh/MarshallInterface.hpp" +#include "rtt/Property.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/base/PropertyIntrospection.hpp" +#include "rtt/marsh/MarshallInterface.hpp" diff --git a/rtt/extras/ReadOnlyPointer.hpp b/rtt/extras/ReadOnlyPointer.hpp index 7bdb0b14b..5db620002 100644 --- a/rtt/extras/ReadOnlyPointer.hpp +++ b/rtt/extras/ReadOnlyPointer.hpp @@ -42,8 +42,8 @@ #include #include -#include "../os/Mutex.hpp" -#include "../os/MutexLock.hpp" +#include "rtt/os/Mutex.hpp" +#include "rtt/os/MutexLock.hpp" namespace RTT { namespace extras { diff --git a/rtt/extras/SequentialActivity.cpp b/rtt/extras/SequentialActivity.cpp index ac79a5ca6..554f3f9a5 100644 --- a/rtt/extras/SequentialActivity.cpp +++ b/rtt/extras/SequentialActivity.cpp @@ -36,9 +36,9 @@ ***************************************************************************/ -#include "SequentialActivity.hpp" -#include "../os/MainThread.hpp" -#include "../os/MutexLock.hpp" +#include "rtt/extras/SequentialActivity.hpp" +#include "rtt/os/MainThread.hpp" +#include "rtt/os/MutexLock.hpp" namespace RTT { using namespace extras; diff --git a/rtt/extras/SequentialActivity.hpp b/rtt/extras/SequentialActivity.hpp index 33c882953..66bd3ed3b 100644 --- a/rtt/extras/SequentialActivity.hpp +++ b/rtt/extras/SequentialActivity.hpp @@ -39,9 +39,9 @@ #ifndef ORO_SEQUENTIAL_ACTIVITY_HPP #define ORO_SEQUENTIAL_ACTIVITY_HPP -#include "../base/ActivityInterface.hpp" -#include "../base/RunnableInterface.hpp" -#include "../os/Mutex.hpp" +#include "rtt/base/ActivityInterface.hpp" +#include "rtt/base/RunnableInterface.hpp" +#include "rtt/os/Mutex.hpp" namespace RTT { namespace extras { diff --git a/rtt/extras/SimulationActivity.cpp b/rtt/extras/SimulationActivity.cpp index 6d3f84d33..eef30eaee 100644 --- a/rtt/extras/SimulationActivity.cpp +++ b/rtt/extras/SimulationActivity.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "SimulationActivity.hpp" -#include "SimulationThread.hpp" +#include "rtt/extras/SimulationActivity.hpp" +#include "rtt/extras/SimulationThread.hpp" namespace RTT { using namespace base; diff --git a/rtt/extras/SimulationActivity.hpp b/rtt/extras/SimulationActivity.hpp index f860bb548..694336294 100644 --- a/rtt/extras/SimulationActivity.hpp +++ b/rtt/extras/SimulationActivity.hpp @@ -39,7 +39,7 @@ #ifndef TASKSIMULATION_HPP #define TASKSIMULATION_HPP -#include "PeriodicActivity.hpp" +#include "rtt/extras/PeriodicActivity.hpp" namespace RTT { namespace extras { diff --git a/rtt/extras/SimulationThread.cpp b/rtt/extras/SimulationThread.cpp index 04de9437c..ab6d795ec 100644 --- a/rtt/extras/SimulationThread.cpp +++ b/rtt/extras/SimulationThread.cpp @@ -37,14 +37,14 @@ -#include "SimulationThread.hpp" -#include "../os/TimeService.hpp" -#include "SimulationActivity.hpp" -#include "../Logger.hpp" -#include "../os/threads.hpp" -#include "../os/MainThread.hpp" - -#include "../os/StartStopManager.hpp" +#include "rtt/extras/SimulationThread.hpp" +#include "rtt/os/TimeService.hpp" +#include "rtt/extras/SimulationActivity.hpp" +#include "rtt/Logger.hpp" +#include "rtt/os/threads.hpp" +#include "rtt/os/MainThread.hpp" + +#include "rtt/os/StartStopManager.hpp" namespace RTT { using namespace extras; namespace diff --git a/rtt/extras/SimulationThread.hpp b/rtt/extras/SimulationThread.hpp index fb7740909..1aff4f33c 100644 --- a/rtt/extras/SimulationThread.hpp +++ b/rtt/extras/SimulationThread.hpp @@ -40,8 +40,8 @@ #ifndef SIMULATIONTHREAD_HPP #define SIMULATIONTHREAD_HPP -#include "TimerThread.hpp" -#include "../os/rtt-os-fwd.hpp" +#include "rtt/extras/TimerThread.hpp" +#include "rtt/os/rtt-os-fwd.hpp" namespace RTT diff --git a/rtt/extras/SlaveActivity.cpp b/rtt/extras/SlaveActivity.cpp index edf22546c..beafc29a1 100644 --- a/rtt/extras/SlaveActivity.cpp +++ b/rtt/extras/SlaveActivity.cpp @@ -36,12 +36,12 @@ ***************************************************************************/ -#include "SlaveActivity.hpp" +#include "rtt/extras/SlaveActivity.hpp" -#include "../base/DisposableInterface.hpp" -#include "../os/MainThread.hpp" -#include "ExecutionEngine.hpp" -#include "Logger.hpp" +#include "rtt/base/DisposableInterface.hpp" +#include "rtt/os/MainThread.hpp" +#include "rtt/ExecutionEngine.hpp" +#include "rtt/Logger.hpp" namespace RTT { using namespace extras; diff --git a/rtt/extras/SlaveActivity.hpp b/rtt/extras/SlaveActivity.hpp index b8fb271e4..47f5ce5fe 100644 --- a/rtt/extras/SlaveActivity.hpp +++ b/rtt/extras/SlaveActivity.hpp @@ -39,8 +39,8 @@ #ifndef ORO_SLAVE_ACTIVITY_HPP #define ORO_SLAVE_ACTIVITY_HPP -#include "../base/ActivityInterface.hpp" -#include "../base/RunnableInterface.hpp" +#include "rtt/base/ActivityInterface.hpp" +#include "rtt/base/RunnableInterface.hpp" #ifdef ORO_PRAGMA_INTERFACE #pragma interface diff --git a/rtt/extras/TaskContexts.hpp b/rtt/extras/TaskContexts.hpp index bfbd832b9..8c6e2a43f 100644 --- a/rtt/extras/TaskContexts.hpp +++ b/rtt/extras/TaskContexts.hpp @@ -55,9 +55,9 @@ * configuration, data communication or execution of functionality. */ -#include "../TaskContext.hpp" -#include "../Operation.hpp" -#include "../OperationCaller.hpp" -#include "../Property.hpp" -#include "../Attribute.hpp" -#include "../Port.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/Operation.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Property.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/Port.hpp" diff --git a/rtt/extras/TimerThread.cpp b/rtt/extras/TimerThread.cpp index b59a67609..ccf00e388 100644 --- a/rtt/extras/TimerThread.cpp +++ b/rtt/extras/TimerThread.cpp @@ -35,16 +35,16 @@ * * ***************************************************************************/ -#include "TimerThread.hpp" -#include "PeriodicActivity.hpp" +#include "rtt/extras/TimerThread.hpp" +#include "rtt/extras/PeriodicActivity.hpp" -#include "rtt-config.h" +#include "rtt/rtt-config.h" -#include "../Time.hpp" -#include "../Logger.hpp" +#include "rtt/Time.hpp" +#include "rtt/Logger.hpp" #include -#include "../os/MutexLock.hpp" -#include "../os/MainThread.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/os/MainThread.hpp" namespace RTT { using namespace extras; diff --git a/rtt/extras/TimerThread.hpp b/rtt/extras/TimerThread.hpp index 7cf96d71c..ccb55f76a 100644 --- a/rtt/extras/TimerThread.hpp +++ b/rtt/extras/TimerThread.hpp @@ -46,9 +46,9 @@ #include #include -#include "../os/Thread.hpp" -#include "../os/Mutex.hpp" -#include "rtt-extras-fwd.hpp" +#include "rtt/os/Thread.hpp" +#include "rtt/os/Mutex.hpp" +#include "rtt/extras/rtt-extras-fwd.hpp" namespace RTT { namespace extras { diff --git a/rtt/extras/dev/AnalogInInterface.hpp b/rtt/extras/dev/AnalogInInterface.hpp index f7271a8d0..d39571979 100644 --- a/rtt/extras/dev/AnalogInInterface.hpp +++ b/rtt/extras/dev/AnalogInInterface.hpp @@ -50,9 +50,9 @@ #ifndef ANALOGININTERFACE_HPP #define ANALOGININTERFACE_HPP -#include "NameServer.hpp" -#include "NameServerRegistrator.hpp" -#include "../../rtt-config.h" +#include "rtt/extras/dev/NameServer.hpp" +#include "rtt/extras/dev/NameServerRegistrator.hpp" +#include "rtt/rtt-config.h" namespace RTT { namespace dev { diff --git a/rtt/extras/dev/AnalogInput.hpp b/rtt/extras/dev/AnalogInput.hpp index d4e6cf51f..01b375719 100644 --- a/rtt/extras/dev/AnalogInput.hpp +++ b/rtt/extras/dev/AnalogInput.hpp @@ -38,7 +38,7 @@ #ifndef ANALOGINPUT_HPP #define ANALOGINPUT_HPP -#include "AnalogInInterface.hpp" +#include "rtt/extras/dev/AnalogInInterface.hpp" namespace RTT { namespace dev { diff --git a/rtt/extras/dev/AnalogOutInterface.hpp b/rtt/extras/dev/AnalogOutInterface.hpp index 837422002..56f975d83 100644 --- a/rtt/extras/dev/AnalogOutInterface.hpp +++ b/rtt/extras/dev/AnalogOutInterface.hpp @@ -49,9 +49,9 @@ #ifndef ANALOGOUTINTERFACE_HPP #define ANALOGOUTINTERFACE_HPP -#include "NameServer.hpp" -#include "NameServerRegistrator.hpp" -#include "../../rtt-config.h" +#include "rtt/extras/dev/NameServer.hpp" +#include "rtt/extras/dev/NameServerRegistrator.hpp" +#include "rtt/rtt-config.h" namespace RTT { namespace dev { diff --git a/rtt/extras/dev/AnalogOutput.hpp b/rtt/extras/dev/AnalogOutput.hpp index 85d1f9463..3554c07f1 100644 --- a/rtt/extras/dev/AnalogOutput.hpp +++ b/rtt/extras/dev/AnalogOutput.hpp @@ -38,7 +38,7 @@ #ifndef ANALOGOUTPUT_HPP #define ANALOGOUTPUT_HPP -#include "AnalogOutInterface.hpp" +#include "rtt/extras/dev/AnalogOutInterface.hpp" namespace RTT { namespace dev { diff --git a/rtt/extras/dev/AxisInterface.cpp b/rtt/extras/dev/AxisInterface.cpp index 11d7478b3..62f1a2c6c 100644 --- a/rtt/extras/dev/AxisInterface.cpp +++ b/rtt/extras/dev/AxisInterface.cpp @@ -29,4 +29,4 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "AxisInterface.hpp" +#include "rtt/extras/dev/AxisInterface.hpp" diff --git a/rtt/extras/dev/AxisInterface.hpp b/rtt/extras/dev/AxisInterface.hpp index 2831c0b90..80c82e3d3 100644 --- a/rtt/extras/dev/AxisInterface.hpp +++ b/rtt/extras/dev/AxisInterface.hpp @@ -27,10 +27,10 @@ #ifndef _AXISINTERFACE_HPP #define _AXISINTERFACE_HPP -#include "SensorInterface.hpp" -#include "DigitalInput.hpp" -#include "DigitalOutput.hpp" -#include "../../rtt-config.h" +#include "rtt/extras/dev/SensorInterface.hpp" +#include "rtt/extras/dev/DigitalInput.hpp" +#include "rtt/extras/dev/DigitalOutput.hpp" +#include "rtt/rtt-config.h" #include #include diff --git a/rtt/extras/dev/CalibrationInterface.hpp b/rtt/extras/dev/CalibrationInterface.hpp index c98f49cd4..de3d70b3d 100644 --- a/rtt/extras/dev/CalibrationInterface.hpp +++ b/rtt/extras/dev/CalibrationInterface.hpp @@ -38,7 +38,7 @@ #ifndef CALIBRATION_INTERFACE_HPP #define CALIBRATION_INTERFACE_HPP -#include "../../rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { namespace dev { diff --git a/rtt/extras/dev/DigitalInInterface.hpp b/rtt/extras/dev/DigitalInInterface.hpp index 9bd0ba107..13e6afddb 100644 --- a/rtt/extras/dev/DigitalInInterface.hpp +++ b/rtt/extras/dev/DigitalInInterface.hpp @@ -39,9 +39,9 @@ #ifndef DIGITALININTERFACE_HPP #define DIGITALININTERFACE_HPP -#include "NameServer.hpp" -#include "NameServerRegistrator.hpp" -#include "../../rtt-config.h" +#include "rtt/extras/dev/NameServer.hpp" +#include "rtt/extras/dev/NameServerRegistrator.hpp" +#include "rtt/rtt-config.h" namespace RTT { namespace dev { diff --git a/rtt/extras/dev/DigitalInput.hpp b/rtt/extras/dev/DigitalInput.hpp index 2ce23c3a5..7be137d21 100644 --- a/rtt/extras/dev/DigitalInput.hpp +++ b/rtt/extras/dev/DigitalInput.hpp @@ -38,7 +38,7 @@ #ifndef DIGITALINPUT_HPP #define DIGITALINPUT_HPP -#include "DigitalInInterface.hpp" +#include "rtt/extras/dev/DigitalInInterface.hpp" namespace RTT { namespace dev { diff --git a/rtt/extras/dev/DigitalOutInterface.hpp b/rtt/extras/dev/DigitalOutInterface.hpp index c6ecc390f..ed304d4b4 100644 --- a/rtt/extras/dev/DigitalOutInterface.hpp +++ b/rtt/extras/dev/DigitalOutInterface.hpp @@ -39,9 +39,9 @@ #ifndef DIGITALOUTINTERFACE_HPP #define DIGITALOUTINTERFACE_HPP -#include "NameServer.hpp" -#include "NameServerRegistrator.hpp" -#include "../../rtt-config.h" +#include "rtt/extras/dev/NameServer.hpp" +#include "rtt/extras/dev/NameServerRegistrator.hpp" +#include "rtt/rtt-config.h" namespace RTT { namespace dev { diff --git a/rtt/extras/dev/DigitalOutput.hpp b/rtt/extras/dev/DigitalOutput.hpp index a2898383b..4679d2165 100644 --- a/rtt/extras/dev/DigitalOutput.hpp +++ b/rtt/extras/dev/DigitalOutput.hpp @@ -38,7 +38,7 @@ #define DIGITAL_OUTPUT_HPP -#include "DigitalOutInterface.hpp" +#include "rtt/extras/dev/DigitalOutInterface.hpp" namespace RTT { namespace dev { diff --git a/rtt/extras/dev/DriveInterface.hpp b/rtt/extras/dev/DriveInterface.hpp index 0960450be..15871f5cb 100644 --- a/rtt/extras/dev/DriveInterface.hpp +++ b/rtt/extras/dev/DriveInterface.hpp @@ -40,8 +40,8 @@ #ifndef DEVICE_DRIVERS_DRIVE_INTERFACE_HPP #define DEVICE_DRIVERS_DRIVE_INTERFACE_HPP -#include "../../rtt-config.h" -#include "../../internal/Signal.hpp" +#include "rtt/rtt-config.h" +#include "rtt/internal/Signal.hpp" namespace RTT { namespace dev { diff --git a/rtt/extras/dev/EncoderInterface.cpp b/rtt/extras/dev/EncoderInterface.cpp index 089c4070a..d11b4c206 100644 --- a/rtt/extras/dev/EncoderInterface.cpp +++ b/rtt/extras/dev/EncoderInterface.cpp @@ -38,7 +38,7 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "EncoderInterface.hpp" +#include "rtt/extras/dev/EncoderInterface.hpp" namespace RTT { using namespace dev; diff --git a/rtt/extras/dev/EncoderInterface.hpp b/rtt/extras/dev/EncoderInterface.hpp index 146f2f035..92c665319 100644 --- a/rtt/extras/dev/EncoderInterface.hpp +++ b/rtt/extras/dev/EncoderInterface.hpp @@ -38,9 +38,9 @@ #ifndef ENCODERINTERFACE_HPP #define ENCODERINTERFACE_HPP -#include "NameServer.hpp" -#include "NameServerRegistrator.hpp" -#include "../../rtt-config.h" +#include "rtt/extras/dev/NameServer.hpp" +#include "rtt/extras/dev/NameServerRegistrator.hpp" +#include "rtt/rtt-config.h" #ifdef ORO_PRAGMA_INTERFACE #pragma interface diff --git a/rtt/extras/dev/HomingInterface.cpp b/rtt/extras/dev/HomingInterface.cpp index b01360f62..bffef79cd 100644 --- a/rtt/extras/dev/HomingInterface.cpp +++ b/rtt/extras/dev/HomingInterface.cpp @@ -29,7 +29,7 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "HomingInterface.hpp" +#include "rtt/extras/dev/HomingInterface.hpp" namespace RTT { using namespace dev; diff --git a/rtt/extras/dev/HomingInterface.hpp b/rtt/extras/dev/HomingInterface.hpp index 4bb3c7a8f..2dedc31e2 100644 --- a/rtt/extras/dev/HomingInterface.hpp +++ b/rtt/extras/dev/HomingInterface.hpp @@ -38,7 +38,7 @@ #ifndef _HOMING_INTERFACE_HPP #define _HOMING_INTERFACE_HPP -#include "../../rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { namespace dev { diff --git a/rtt/extras/dev/NameServer.hpp b/rtt/extras/dev/NameServer.hpp index b86f4179b..fd92cc75f 100644 --- a/rtt/extras/dev/NameServer.hpp +++ b/rtt/extras/dev/NameServer.hpp @@ -41,7 +41,7 @@ #include #include #include -// #include "rtt-config.h" +// #include "rtt/rtt-config.h" // #ifdef OROPKG_CORELIB_REPORTING // #include "../../Logger.hpp" // #endif diff --git a/rtt/extras/dev/NameServerRegistrator.hpp b/rtt/extras/dev/NameServerRegistrator.hpp index a1abd33e9..507f0ef0f 100644 --- a/rtt/extras/dev/NameServerRegistrator.hpp +++ b/rtt/extras/dev/NameServerRegistrator.hpp @@ -38,7 +38,7 @@ #ifndef NAMESERVERREGISTRATION_HPP #define NAMESERVERREGISTRATION_HPP -#include "NameServer.hpp" +#include "rtt/extras/dev/NameServer.hpp" #include namespace RTT { namespace dev { diff --git a/rtt/extras/dev/PulseTrainGeneratorInterface.cpp b/rtt/extras/dev/PulseTrainGeneratorInterface.cpp index 2d8f1158a..af0c38b4d 100644 --- a/rtt/extras/dev/PulseTrainGeneratorInterface.cpp +++ b/rtt/extras/dev/PulseTrainGeneratorInterface.cpp @@ -28,7 +28,7 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "PulseTrainGeneratorInterface.hpp" +#include "rtt/extras/dev/PulseTrainGeneratorInterface.hpp" namespace RTT { using namespace dev; diff --git a/rtt/extras/dev/PulseTrainGeneratorInterface.hpp b/rtt/extras/dev/PulseTrainGeneratorInterface.hpp index 1294d008e..ee2ddece6 100644 --- a/rtt/extras/dev/PulseTrainGeneratorInterface.hpp +++ b/rtt/extras/dev/PulseTrainGeneratorInterface.hpp @@ -28,10 +28,10 @@ #ifndef PULSETRAINGENERATOR_HPP #define PULSETRAINGENERATOR_HPP -#include "NameServer.hpp" -#include "NameServerRegistrator.hpp" -#include "../../Time.hpp" // Orocos Time types -#include "../../rtt-config.h" +#include "rtt/extras/dev/NameServer.hpp" +#include "rtt/extras/dev/NameServerRegistrator.hpp" +#include "rtt/Time.hpp" +#include "rtt/rtt-config.h" #ifdef ORO_PRAGMA_INTERFACE #pragma interface diff --git a/rtt/extras/dev/SensorInterface.cpp b/rtt/extras/dev/SensorInterface.cpp index aa4099c02..64cd728e9 100644 --- a/rtt/extras/dev/SensorInterface.cpp +++ b/rtt/extras/dev/SensorInterface.cpp @@ -38,4 +38,4 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "SensorInterface.hpp" +#include "rtt/extras/dev/SensorInterface.hpp" diff --git a/rtt/extras/dev/SensorInterface.hpp b/rtt/extras/dev/SensorInterface.hpp index 232dc6cb3..ae6725085 100644 --- a/rtt/extras/dev/SensorInterface.hpp +++ b/rtt/extras/dev/SensorInterface.hpp @@ -39,7 +39,7 @@ #ifndef SENSORINTERFACE_HPP #define SENSORINTERFACE_HPP -#include "CalibrationInterface.hpp" +#include "rtt/extras/dev/CalibrationInterface.hpp" #ifdef ORO_PRAGMA_INTERFACE #pragma interface diff --git a/rtt/extras/dev/io.cpp b/rtt/extras/dev/io.cpp index b5793ca02..4e5db5469 100644 --- a/rtt/extras/dev/io.cpp +++ b/rtt/extras/dev/io.cpp @@ -34,14 +34,14 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "DigitalInInterface.hpp" -#include "DigitalOutInterface.hpp" -#include "AnalogInInterface.hpp" -#include "AnalogOutInterface.hpp" -#include "AnalogInput.hpp" -#include "AnalogOutput.hpp" -#include "DigitalInput.hpp" -#include "DigitalOutput.hpp" +#include "rtt/extras/dev/DigitalInInterface.hpp" +#include "rtt/extras/dev/DigitalOutInterface.hpp" +#include "rtt/extras/dev/AnalogInInterface.hpp" +#include "rtt/extras/dev/AnalogOutInterface.hpp" +#include "rtt/extras/dev/AnalogInput.hpp" +#include "rtt/extras/dev/AnalogOutput.hpp" +#include "rtt/extras/dev/DigitalInput.hpp" +#include "rtt/extras/dev/DigitalOutput.hpp" using namespace RTT; using namespace RTT::dev; diff --git a/rtt/internal/ArrayPartDataSource.hpp b/rtt/internal/ArrayPartDataSource.hpp index 3a1206ca7..064bdb7fb 100644 --- a/rtt/internal/ArrayPartDataSource.hpp +++ b/rtt/internal/ArrayPartDataSource.hpp @@ -39,8 +39,8 @@ #ifndef ORO_ARRAYPARTDATASOURCE_HPP_ #define ORO_ARRAYPARTDATASOURCE_HPP_ -#include "DataSource.hpp" -#include "NA.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/internal/NA.hpp" namespace RTT { diff --git a/rtt/internal/AssignCommand.hpp b/rtt/internal/AssignCommand.hpp index a33953742..0cbfcaaaf 100644 --- a/rtt/internal/AssignCommand.hpp +++ b/rtt/internal/AssignCommand.hpp @@ -35,12 +35,12 @@ * * ***************************************************************************/ -#include "DataSource.hpp" +#include "rtt/internal/DataSource.hpp" #ifndef ORO_ASSIGNCOMMAND_HPP #define ORO_ASSIGNCOMMAND_HPP -#include "../base/ActionInterface.hpp" +#include "rtt/base/ActionInterface.hpp" namespace RTT { diff --git a/rtt/internal/AtomicMWMRQueue.hpp b/rtt/internal/AtomicMWMRQueue.hpp index 4f94bb342..34f691ff2 100644 --- a/rtt/internal/AtomicMWMRQueue.hpp +++ b/rtt/internal/AtomicMWMRQueue.hpp @@ -39,8 +39,8 @@ #ifndef ORO_CORELIB_ATOMIC_MWMR_QUEUE_HPP #define ORO_CORELIB_ATOMIC_MWMR_QUEUE_HPP -#include "AtomicQueue.hpp" -#include "../os/CAS.hpp" +#include "rtt/internal/AtomicQueue.hpp" +#include "rtt/os/CAS.hpp" #include namespace RTT diff --git a/rtt/internal/AtomicMWSRQueue.hpp b/rtt/internal/AtomicMWSRQueue.hpp index 6fb929be4..889140b6b 100644 --- a/rtt/internal/AtomicMWSRQueue.hpp +++ b/rtt/internal/AtomicMWSRQueue.hpp @@ -39,8 +39,8 @@ #ifndef ORO_CORELIB_ATOMIC_MWSR_QUEUE_HPP #define ORO_CORELIB_ATOMIC_MWSR_QUEUE_HPP -#include "AtomicQueue.hpp" -#include "../os/CAS.hpp" +#include "rtt/internal/AtomicQueue.hpp" +#include "rtt/os/CAS.hpp" #include namespace RTT diff --git a/rtt/internal/BindStorage.hpp b/rtt/internal/BindStorage.hpp index 663ead4f4..bff280150 100644 --- a/rtt/internal/BindStorage.hpp +++ b/rtt/internal/BindStorage.hpp @@ -44,11 +44,11 @@ #include #include #include -#include "NA.hpp" -#include "../Logger.hpp" +#include "rtt/internal/NA.hpp" +#include "rtt/Logger.hpp" #ifdef ORO_SIGNALLING_OPERATIONS -#include "Signal.hpp" +#include "rtt/internal/Signal.hpp" #endif namespace RTT diff --git a/rtt/internal/CatchConfig.cpp b/rtt/internal/CatchConfig.cpp index 7c4441499..12eff8631 100644 --- a/rtt/internal/CatchConfig.cpp +++ b/rtt/internal/CatchConfig.cpp @@ -35,5 +35,5 @@ * * ***************************************************************************/ -#include +#include "rtt/internal/CatchConfig.hpp" int RTT::internal::m_catch_exception=-1; diff --git a/rtt/internal/ChannelBufferElement.hpp b/rtt/internal/ChannelBufferElement.hpp index d2bc72be3..bb54a81f4 100644 --- a/rtt/internal/ChannelBufferElement.hpp +++ b/rtt/internal/ChannelBufferElement.hpp @@ -39,9 +39,9 @@ #ifndef ORO_CHANNEL_BUFFER_ELEMENT_HPP #define ORO_CHANNEL_BUFFER_ELEMENT_HPP -#include "../base/ChannelElement.hpp" -#include "../base/BufferInterface.hpp" -#include "../ConnPolicy.hpp" +#include "rtt/base/ChannelElement.hpp" +#include "rtt/base/BufferInterface.hpp" +#include "rtt/ConnPolicy.hpp" namespace RTT { namespace internal { diff --git a/rtt/internal/ChannelDataElement.hpp b/rtt/internal/ChannelDataElement.hpp index 8e6e0bd71..d99695f6a 100644 --- a/rtt/internal/ChannelDataElement.hpp +++ b/rtt/internal/ChannelDataElement.hpp @@ -39,9 +39,9 @@ #ifndef ORO_CHANNEL_DATA_ELEMENT_HPP #define ORO_CHANNEL_DATA_ELEMENT_HPP -#include "../base/ChannelElement.hpp" -#include "../base/DataObjectInterface.hpp" -#include "../ConnPolicy.hpp" +#include "rtt/base/ChannelElement.hpp" +#include "rtt/base/DataObjectInterface.hpp" +#include "rtt/ConnPolicy.hpp" namespace RTT { namespace internal { diff --git a/rtt/internal/Channels.hpp b/rtt/internal/Channels.hpp index 66aea798b..9607c6515 100644 --- a/rtt/internal/Channels.hpp +++ b/rtt/internal/Channels.hpp @@ -39,8 +39,8 @@ #ifndef ORO_EXECUTION_CHANNELS_HPP #define ORO_EXECUTION_CHANNELS_HPP -#include "ChannelDataElement.hpp" -#include "ChannelBufferElement.hpp" +#include "rtt/internal/ChannelDataElement.hpp" +#include "rtt/internal/ChannelBufferElement.hpp" #endif diff --git a/rtt/internal/Collect.hpp b/rtt/internal/Collect.hpp index e6769ebf8..7fef000fc 100644 --- a/rtt/internal/Collect.hpp +++ b/rtt/internal/Collect.hpp @@ -39,8 +39,8 @@ #ifndef ORO_COLLECT_HPP #define ORO_COLLECT_HPP -#include "CollectSignature.hpp" -#include "../SendStatus.hpp" +#include "rtt/internal/CollectSignature.hpp" +#include "rtt/SendStatus.hpp" #include #include diff --git a/rtt/internal/CollectBase.hpp b/rtt/internal/CollectBase.hpp index 74ee0226d..b77d1b20f 100644 --- a/rtt/internal/CollectBase.hpp +++ b/rtt/internal/CollectBase.hpp @@ -39,9 +39,9 @@ #ifndef ORO_COLLECT_BASE_HPP #define ORO_COLLECT_BASE_HPP -#include "CollectSignature.hpp" -#include "../SendStatus.hpp" -#include "ReturnBase.hpp" +#include "rtt/internal/CollectSignature.hpp" +#include "rtt/SendStatus.hpp" +#include "rtt/internal/ReturnBase.hpp" #include namespace RTT diff --git a/rtt/internal/CollectSignature.hpp b/rtt/internal/CollectSignature.hpp index edb023676..2de932922 100644 --- a/rtt/internal/CollectSignature.hpp +++ b/rtt/internal/CollectSignature.hpp @@ -50,7 +50,7 @@ #include #include #include -#include "../SendStatus.hpp" +#include "rtt/SendStatus.hpp" namespace RTT { diff --git a/rtt/internal/ConnFactory.cpp b/rtt/internal/ConnFactory.cpp index b985a7c27..3538f731a 100644 --- a/rtt/internal/ConnFactory.cpp +++ b/rtt/internal/ConnFactory.cpp @@ -36,11 +36,11 @@ ***************************************************************************/ -#include "../Port.hpp" -#include "ConnFactory.hpp" -#include "../base/InputPortInterface.hpp" -#include "../DataFlowInterface.hpp" -#include "../types/TypeMarshaller.hpp" +#include "rtt/Port.hpp" +#include "rtt/internal/ConnFactory.hpp" +#include "rtt/base/InputPortInterface.hpp" +#include "rtt/DataFlowInterface.hpp" +#include "rtt/types/TypeMarshaller.hpp" using namespace std; using namespace RTT; diff --git a/rtt/internal/ConnFactory.hpp b/rtt/internal/ConnFactory.hpp index 3144f3a25..c52eb77b9 100644 --- a/rtt/internal/ConnFactory.hpp +++ b/rtt/internal/ConnFactory.hpp @@ -40,23 +40,23 @@ #define ORO_CONN_FACTORY_HPP #include -#include "Channels.hpp" -#include "ConnInputEndPoint.hpp" -#include "ConnOutputEndPoint.hpp" -#include "PortConnectionLock.hpp" -#include "SharedConnection.hpp" -#include "../base/PortInterface.hpp" -#include "../base/InputPortInterface.hpp" -#include "../base/OutputPortInterface.hpp" -#include "../DataFlowInterface.hpp" - -#include "../base/DataObject.hpp" -#include "../base/DataObjectUnSync.hpp" -#include "../base/Buffer.hpp" -#include "../base/BufferUnSync.hpp" -#include "../Logger.hpp" - -#include "../rtt-config.h" +#include "rtt/internal/Channels.hpp" +#include "rtt/internal/ConnInputEndPoint.hpp" +#include "rtt/internal/ConnOutputEndPoint.hpp" +#include "rtt/internal/PortConnectionLock.hpp" +#include "rtt/internal/SharedConnection.hpp" +#include "rtt/base/PortInterface.hpp" +#include "rtt/base/InputPortInterface.hpp" +#include "rtt/base/OutputPortInterface.hpp" +#include "rtt/DataFlowInterface.hpp" + +#include "rtt/base/DataObject.hpp" +#include "rtt/base/DataObjectUnSync.hpp" +#include "rtt/base/Buffer.hpp" +#include "rtt/base/BufferUnSync.hpp" +#include "rtt/Logger.hpp" + +#include "rtt/rtt-config.h" namespace RTT { namespace internal { diff --git a/rtt/internal/ConnID.cpp b/rtt/internal/ConnID.cpp index c2525ee8a..7cda9d9d5 100644 --- a/rtt/internal/ConnID.cpp +++ b/rtt/internal/ConnID.cpp @@ -43,7 +43,7 @@ * Author: kaltan */ -#include "ConnID.hpp" +#include "rtt/internal/ConnID.hpp" using namespace RTT::internal; diff --git a/rtt/internal/ConnID.hpp b/rtt/internal/ConnID.hpp index 642fc4de3..35156a991 100644 --- a/rtt/internal/ConnID.hpp +++ b/rtt/internal/ConnID.hpp @@ -46,7 +46,7 @@ #ifndef ORO_CONNID_HPP_ #define ORO_CONNID_HPP_ -#include "../rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { diff --git a/rtt/internal/ConnInputEndPoint.hpp b/rtt/internal/ConnInputEndPoint.hpp index 1d20ea7a8..71d602322 100644 --- a/rtt/internal/ConnInputEndPoint.hpp +++ b/rtt/internal/ConnInputEndPoint.hpp @@ -39,8 +39,8 @@ #ifndef ORO_CONN_INPUT_ENDPOINT_HPP #define ORO_CONN_INPUT_ENDPOINT_HPP -#include "Channels.hpp" -#include "PortConnectionLock.hpp" +#include "rtt/internal/Channels.hpp" +#include "rtt/internal/PortConnectionLock.hpp" namespace RTT { namespace internal { diff --git a/rtt/internal/ConnOutputEndPoint.hpp b/rtt/internal/ConnOutputEndPoint.hpp index 2791eb2eb..ccad276cd 100644 --- a/rtt/internal/ConnOutputEndPoint.hpp +++ b/rtt/internal/ConnOutputEndPoint.hpp @@ -39,9 +39,9 @@ #ifndef ORO_CONN_OUTPUT_ENDPOINT_HPP #define ORO_CONN_OUTPUT_ENDPOINT_HPP -#include "Channels.hpp" -#include "ConnID.hpp" -#include "PortConnectionLock.hpp" +#include "rtt/internal/Channels.hpp" +#include "rtt/internal/ConnID.hpp" +#include "rtt/internal/PortConnectionLock.hpp" namespace RTT { namespace internal { diff --git a/rtt/internal/ConnectionManager.cpp b/rtt/internal/ConnectionManager.cpp index 72692855e..b7cef8ce0 100644 --- a/rtt/internal/ConnectionManager.cpp +++ b/rtt/internal/ConnectionManager.cpp @@ -43,14 +43,14 @@ * Author: kaltan */ -#include "ConnectionManager.hpp" -#include "PortConnectionLock.hpp" +#include "rtt/internal/ConnectionManager.hpp" +#include "rtt/internal/PortConnectionLock.hpp" #include #include -#include "../base/PortInterface.hpp" -#include "../os/MutexLock.hpp" -#include "../base/InputPortInterface.hpp" -#include "../Logger.hpp" +#include "rtt/base/PortInterface.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/base/InputPortInterface.hpp" +#include "rtt/Logger.hpp" #include namespace RTT diff --git a/rtt/internal/ConnectionManager.hpp b/rtt/internal/ConnectionManager.hpp index 471c8a0b7..9d7a90680 100644 --- a/rtt/internal/ConnectionManager.hpp +++ b/rtt/internal/ConnectionManager.hpp @@ -47,20 +47,20 @@ #define CONNECTIONMANAGER_HPP_ -#include "ConnID.hpp" -#include "List.hpp" -#include "SharedConnection.hpp" -#include "../ConnPolicy.hpp" -#include "../os/Mutex.hpp" -#include "../base/rtt-base-fwd.hpp" -#include "../base/ChannelElementBase.hpp" +#include "rtt/internal/ConnID.hpp" +#include "rtt/internal/List.hpp" +#include "rtt/internal/SharedConnection.hpp" +#include "rtt/ConnPolicy.hpp" +#include "rtt/os/Mutex.hpp" +#include "rtt/base/rtt-base-fwd.hpp" +#include "rtt/base/ChannelElementBase.hpp" #include #include #include #include -#include -#include +#include "rtt/os/Mutex.hpp" +#include "rtt/os/MutexLock.hpp" #include diff --git a/rtt/internal/CreateSequence.hpp b/rtt/internal/CreateSequence.hpp index 5d4e05d87..9572c2214 100644 --- a/rtt/internal/CreateSequence.hpp +++ b/rtt/internal/CreateSequence.hpp @@ -51,10 +51,10 @@ #include #include -#include "DataSource.hpp" -#include "Exceptions.hpp" -#include "../FactoryExceptions.hpp" -#include "mystd.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/internal/Exceptions.hpp" +#include "rtt/FactoryExceptions.hpp" +#include "rtt/internal/mystd.hpp" #include diff --git a/rtt/internal/DataObjectDataSource.hpp b/rtt/internal/DataObjectDataSource.hpp index 81f1ac74e..fcfe72538 100644 --- a/rtt/internal/DataObjectDataSource.hpp +++ b/rtt/internal/DataObjectDataSource.hpp @@ -39,8 +39,8 @@ #ifndef DATAOBJECTDATASOURCE_HPP_ #define DATAOBJECTDATASOURCE_HPP_ -#include "DataSource.hpp" -#include "../base/DataObjectInterface.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/base/DataObjectInterface.hpp" namespace RTT { diff --git a/rtt/internal/DataSource.cpp b/rtt/internal/DataSource.cpp index ce4fe005f..5323e6d8a 100644 --- a/rtt/internal/DataSource.cpp +++ b/rtt/internal/DataSource.cpp @@ -34,12 +34,12 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "DataSource.hpp" -#include "../types/TypeInfoName.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/types/TypeInfoName.hpp" -#include "rtt-config.h" -#include "../types/Types.hpp" -#include "../types/TypeTransporter.hpp" +#include "rtt/rtt-config.h" +#include "rtt/types/Types.hpp" +#include "rtt/types/TypeTransporter.hpp" namespace RTT { namespace base { diff --git a/rtt/internal/DataSource.hpp b/rtt/internal/DataSource.hpp index 559ae3119..6f5fa2b3b 100644 --- a/rtt/internal/DataSource.hpp +++ b/rtt/internal/DataSource.hpp @@ -41,13 +41,13 @@ #include #include #include -#include "../rtt-config.h" +#include "rtt/rtt-config.h" #include #include #include #include -#include "../base/DataSourceBase.hpp" +#include "rtt/base/DataSourceBase.hpp" namespace RTT { namespace internal { @@ -234,7 +234,7 @@ namespace RTT // workaround inclusion dependencies. #ifndef ORO_CORELIB_DATASOURCES_HPP -#include "DataSource.inl" +#include "rtt/internal/DataSource.inl" #endif /* diff --git a/rtt/internal/DataSource.inl b/rtt/internal/DataSource.inl index 282043371..7e3ac250a 100644 --- a/rtt/internal/DataSource.inl +++ b/rtt/internal/DataSource.inl @@ -39,11 +39,11 @@ #ifndef CORELIB_DATASOURCE_INL #define CORELIB_DATASOURCE_INL -#include "AssignCommand.hpp" -#include "DataSourceTypeInfo.hpp" -#include "../types/TypeTransporter.hpp" +#include "rtt/internal/AssignCommand.hpp" +#include "rtt/internal/DataSourceTypeInfo.hpp" +#include "rtt/types/TypeTransporter.hpp" -#include "../rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { namespace internal { diff --git a/rtt/internal/DataSourceCommand.cpp b/rtt/internal/DataSourceCommand.cpp index 0d05d18c8..710b34c96 100644 --- a/rtt/internal/DataSourceCommand.cpp +++ b/rtt/internal/DataSourceCommand.cpp @@ -36,9 +36,9 @@ ***************************************************************************/ -#include "DataSourceCommand.hpp" +#include "rtt/internal/DataSourceCommand.hpp" -#include "../base/ActionInterface.hpp" +#include "rtt/base/ActionInterface.hpp" namespace RTT { using namespace detail; diff --git a/rtt/internal/DataSourceCommand.hpp b/rtt/internal/DataSourceCommand.hpp index b278867f0..b4c8713ad 100644 --- a/rtt/internal/DataSourceCommand.hpp +++ b/rtt/internal/DataSourceCommand.hpp @@ -39,8 +39,8 @@ #ifndef DATASOURCECOMMAND_HPP #define DATASOURCECOMMAND_HPP -#include "../internal/DataSource.hpp" -#include "../base/ActionInterface.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/base/ActionInterface.hpp" namespace RTT { namespace internal { diff --git a/rtt/internal/DataSourceGenerator.hpp b/rtt/internal/DataSourceGenerator.hpp index a1c8e7a94..5802c9e32 100644 --- a/rtt/internal/DataSourceGenerator.hpp +++ b/rtt/internal/DataSourceGenerator.hpp @@ -39,7 +39,7 @@ #ifndef ORO_EXECUTION_DATASOURCE_GENERATOR_HPP #define ORO_EXECUTION_DATASOURCE_GENERATOR_HPP -#include "DataSources.hpp" +#include "rtt/internal/DataSources.hpp" #include #include #include diff --git a/rtt/internal/DataSourceStorage.hpp b/rtt/internal/DataSourceStorage.hpp index 4b16abe93..625a22d7b 100644 --- a/rtt/internal/DataSourceStorage.hpp +++ b/rtt/internal/DataSourceStorage.hpp @@ -44,8 +44,8 @@ #include #include #include -#include "DataSources.hpp" -#include "BindStorage.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/internal/BindStorage.hpp" namespace RTT { diff --git a/rtt/internal/DataSourceTypeInfo.hpp b/rtt/internal/DataSourceTypeInfo.hpp index c0e486023..2faa5f1e4 100644 --- a/rtt/internal/DataSourceTypeInfo.hpp +++ b/rtt/internal/DataSourceTypeInfo.hpp @@ -41,9 +41,9 @@ #include #include -#include "../types/carray.hpp" -#include "../rtt-config.h" -#include "../types/rtt-types-fwd.hpp" +#include "rtt/types/carray.hpp" +#include "rtt/rtt-config.h" +#include "rtt/types/rtt-types-fwd.hpp" namespace RTT { @@ -235,4 +235,4 @@ namespace RTT #endif -#include "DataSourceTypeInfo.inl" +#include "rtt/internal/DataSourceTypeInfo.inl" diff --git a/rtt/internal/DataSourceTypeInfo.inl b/rtt/internal/DataSourceTypeInfo.inl index 6daf6dcc5..adc9d4306 100644 --- a/rtt/internal/DataSourceTypeInfo.inl +++ b/rtt/internal/DataSourceTypeInfo.inl @@ -39,8 +39,8 @@ #ifndef DATASOURCE_TYPE_INFO_INL #define DATASOURCE_TYPE_INFO_INL -#include "../types/TypeInfo.hpp" -#include "../types/TypeInfoRepository.hpp" +#include "rtt/types/TypeInfo.hpp" +#include "rtt/types/TypeInfoRepository.hpp" namespace RTT { diff --git a/rtt/internal/DataSources.cpp b/rtt/internal/DataSources.cpp index 2946ee532..963c23dc6 100644 --- a/rtt/internal/DataSources.cpp +++ b/rtt/internal/DataSources.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "DataSources.hpp" +#include "rtt/internal/DataSources.hpp" namespace RTT { namespace internal { diff --git a/rtt/internal/DataSources.hpp b/rtt/internal/DataSources.hpp index d2f6ae250..3114f20db 100644 --- a/rtt/internal/DataSources.hpp +++ b/rtt/internal/DataSources.hpp @@ -39,10 +39,10 @@ #ifndef ORO_CORELIB_DATASOURCES_HPP #define ORO_CORELIB_DATASOURCES_HPP -#include "mystd.hpp" -#include "DataSource.hpp" -#include "DataSourceTypeInfo.hpp" -#include "Reference.hpp" +#include "rtt/internal/mystd.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/internal/DataSourceTypeInfo.hpp" +#include "rtt/internal/Reference.hpp" #include namespace RTT @@ -868,7 +868,7 @@ namespace RTT } } -#include "DataSources.inl" +#include "rtt/internal/DataSources.inl" /* * Extern template declarations for core data source types diff --git a/rtt/internal/DataSources.inl b/rtt/internal/DataSources.inl index 6c576b230..a468f4d01 100644 --- a/rtt/internal/DataSources.inl +++ b/rtt/internal/DataSources.inl @@ -39,8 +39,8 @@ #ifndef ORO_CORELIB_DATASOURCES_INL #define ORO_CORELIB_DATASOURCES_INL -#include "DataSources.hpp" -#include "DataSource.inl" +#include "rtt/internal/DataSources.hpp" +#include "rtt/internal/DataSource.inl" namespace RTT { namespace internal { diff --git a/rtt/internal/Exceptions.hpp b/rtt/internal/Exceptions.hpp index c2f7d316a..c66ef718e 100644 --- a/rtt/internal/Exceptions.hpp +++ b/rtt/internal/Exceptions.hpp @@ -39,7 +39,7 @@ #ifndef ORO_EXCEPTIONS_HPP #define ORO_EXCEPTIONS_HPP -#include "../rtt-config.h" +#include "rtt/rtt-config.h" /** * @file Exceptions.hpp diff --git a/rtt/internal/FusedFunctorDataSource.hpp b/rtt/internal/FusedFunctorDataSource.hpp index fad59a9e1..dd883045d 100644 --- a/rtt/internal/FusedFunctorDataSource.hpp +++ b/rtt/internal/FusedFunctorDataSource.hpp @@ -39,13 +39,13 @@ #ifndef ORO_FUSEDFUNCTORDATASOURCE_HPP_ #define ORO_FUSEDFUNCTORDATASOURCE_HPP_ -#include "DataSource.hpp" -#include "CreateSequence.hpp" -#include "../SendStatus.hpp" -#include "BindStorage.hpp" -#include "../ExecutionEngine.hpp" -#include "../os/oro_allocator.hpp" -#include "UnMember.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/internal/CreateSequence.hpp" +#include "rtt/SendStatus.hpp" +#include "rtt/internal/BindStorage.hpp" +#include "rtt/ExecutionEngine.hpp" +#include "rtt/os/oro_allocator.hpp" +#include "rtt/internal/UnMember.hpp" #include #include #include diff --git a/rtt/internal/GetSignature.hpp b/rtt/internal/GetSignature.hpp index 980ce43d3..9bfc01f8f 100644 --- a/rtt/internal/GetSignature.hpp +++ b/rtt/internal/GetSignature.hpp @@ -39,7 +39,7 @@ #ifndef ORO_GETSIGNATURE_HPP #define ORO_GETSIGNATURE_HPP -#include "UnMember.hpp" +#include "rtt/internal/UnMember.hpp" namespace RTT { diff --git a/rtt/internal/GlobalEngine.cpp b/rtt/internal/GlobalEngine.cpp index 41a90bad1..36b1e567f 100644 --- a/rtt/internal/GlobalEngine.cpp +++ b/rtt/internal/GlobalEngine.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "GlobalEngine.hpp" -#include "../Activity.hpp" +#include "rtt/internal/GlobalEngine.hpp" +#include "rtt/Activity.hpp" namespace RTT { diff --git a/rtt/internal/GlobalEngine.hpp b/rtt/internal/GlobalEngine.hpp index 1da901ceb..285d7d516 100644 --- a/rtt/internal/GlobalEngine.hpp +++ b/rtt/internal/GlobalEngine.hpp @@ -39,7 +39,7 @@ #ifndef ORO_GLOBALENGINE_HPP_ #define ORO_GLOBALENGINE_HPP_ -#include "../ExecutionEngine.hpp" +#include "rtt/ExecutionEngine.hpp" #include namespace RTT diff --git a/rtt/internal/GlobalService.cpp b/rtt/internal/GlobalService.cpp index 8e7899d91..608a736cc 100644 --- a/rtt/internal/GlobalService.cpp +++ b/rtt/internal/GlobalService.cpp @@ -36,10 +36,10 @@ ***************************************************************************/ -#include "GlobalService.hpp" -#include "../plugin/PluginLoader.hpp" +#include "rtt/internal/GlobalService.hpp" +#include "rtt/plugin/PluginLoader.hpp" -#include "../os/StartStopManager.hpp" +#include "rtt/os/StartStopManager.hpp" namespace RTT { diff --git a/rtt/internal/GlobalService.hpp b/rtt/internal/GlobalService.hpp index 05b4e01cb..ddedd4af0 100644 --- a/rtt/internal/GlobalService.hpp +++ b/rtt/internal/GlobalService.hpp @@ -40,7 +40,7 @@ #ifndef ORO_GLOBALSERVICE_HPP_ #define ORO_GLOBALSERVICE_HPP_ -#include "../Service.hpp" +#include "rtt/Service.hpp" #include namespace RTT diff --git a/rtt/internal/InputPortSource.hpp b/rtt/internal/InputPortSource.hpp index e0738012d..b7b4878c4 100644 --- a/rtt/internal/InputPortSource.hpp +++ b/rtt/internal/InputPortSource.hpp @@ -39,8 +39,8 @@ #ifndef ORO_INPUT_PORT_SOURCE_HPP #define ORO_INPUT_PORT_SOURCE_HPP -#include "Channels.hpp" -#include "../base/PortInterface.hpp" +#include "rtt/internal/Channels.hpp" +#include "rtt/base/PortInterface.hpp" namespace RTT { namespace internal { diff --git a/rtt/internal/Invoker.hpp b/rtt/internal/Invoker.hpp index f026771f7..2d01a5a33 100644 --- a/rtt/internal/Invoker.hpp +++ b/rtt/internal/Invoker.hpp @@ -42,8 +42,8 @@ #include #include #include -#include "InvokerBase.hpp" -#include "Return.hpp" +#include "rtt/internal/InvokerBase.hpp" +#include "rtt/internal/Return.hpp" namespace RTT { diff --git a/rtt/internal/InvokerBase.hpp b/rtt/internal/InvokerBase.hpp index b0d3ec03a..84873d972 100644 --- a/rtt/internal/InvokerBase.hpp +++ b/rtt/internal/InvokerBase.hpp @@ -42,9 +42,9 @@ #include #include #include -#include "NA.hpp" -#include "../SendHandle.hpp" -#include "../rtt-fwd.hpp" +#include "rtt/internal/NA.hpp" +#include "rtt/SendHandle.hpp" +#include "rtt/rtt-fwd.hpp" namespace RTT { diff --git a/rtt/internal/InvokerSignature.hpp b/rtt/internal/InvokerSignature.hpp index e156abf1b..2bf6e2ad3 100644 --- a/rtt/internal/InvokerSignature.hpp +++ b/rtt/internal/InvokerSignature.hpp @@ -40,8 +40,8 @@ #define ORO_INVOKER_SIGNATURE_HPP #include -#include "NA.hpp" -#include "../rtt-fwd.hpp" +#include "rtt/internal/NA.hpp" +#include "rtt/rtt-fwd.hpp" namespace RTT { diff --git a/rtt/internal/List.hpp b/rtt/internal/List.hpp index 0ca0625a8..1e1e17eb5 100644 --- a/rtt/internal/List.hpp +++ b/rtt/internal/List.hpp @@ -40,7 +40,7 @@ #ifndef ORO_LIST_HPP_ #define ORO_LIST_HPP_ -#include "../rtt-config.h" +#include "rtt/rtt-config.h" /** * @file List.hpp @@ -49,9 +49,9 @@ * parameters. */ #if defined(OROBLD_OS_NO_ASM) -#include "ListLocked.hpp" +#include "rtt/internal/ListLocked.hpp" #else -#include "ListLockFree.hpp" +#include "rtt/internal/ListLockFree.hpp" #endif namespace RTT diff --git a/rtt/internal/ListLockFree.cpp b/rtt/internal/ListLockFree.cpp index 2c0b29226..85b66fe86 100644 --- a/rtt/internal/ListLockFree.cpp +++ b/rtt/internal/ListLockFree.cpp @@ -40,7 +40,7 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "ListLockFree.hpp" +#include "rtt/internal/ListLockFree.hpp" namespace RTT { diff --git a/rtt/internal/ListLockFree.hpp b/rtt/internal/ListLockFree.hpp index 053477493..7a887cce9 100644 --- a/rtt/internal/ListLockFree.hpp +++ b/rtt/internal/ListLockFree.hpp @@ -40,10 +40,10 @@ #define ORO_LIST_LOCK_FREE_HPP #include -#include "../os/oro_arch.h" -#include "../os/CAS.hpp" +#include "rtt/os/oro_arch.h" +#include "rtt/os/CAS.hpp" #include -#include "../rtt-config.h" +#include "rtt/rtt-config.h" #ifdef ORO_PRAGMA_INTERFACE #pragma interface diff --git a/rtt/internal/ListLocked.hpp b/rtt/internal/ListLocked.hpp index 601be3913..f67d13771 100644 --- a/rtt/internal/ListLocked.hpp +++ b/rtt/internal/ListLocked.hpp @@ -46,8 +46,8 @@ #include #include #include -#include "../os/Mutex.hpp" -#include "../os/MutexLock.hpp" +#include "rtt/os/Mutex.hpp" +#include "rtt/os/MutexLock.hpp" #ifdef ORO_PRAGMA_INTERFACE #pragma interface diff --git a/rtt/internal/LocalOperationCaller.hpp b/rtt/internal/LocalOperationCaller.hpp index 33bdd6bb0..12362aae6 100644 --- a/rtt/internal/LocalOperationCaller.hpp +++ b/rtt/internal/LocalOperationCaller.hpp @@ -43,16 +43,16 @@ #include #include #include -#include "Invoker.hpp" -#include "../base/OperationCallerBase.hpp" -#include "../base/OperationBase.hpp" -#include "BindStorage.hpp" -#include "../SendStatus.hpp" -#include "../SendHandle.hpp" -#include "../ExecutionEngine.hpp" -#include "OperationCallerBinder.hpp" +#include "rtt/internal/Invoker.hpp" +#include "rtt/base/OperationCallerBase.hpp" +#include "rtt/base/OperationBase.hpp" +#include "rtt/internal/BindStorage.hpp" +#include "rtt/SendStatus.hpp" +#include "rtt/SendHandle.hpp" +#include "rtt/ExecutionEngine.hpp" +#include "rtt/internal/OperationCallerBinder.hpp" #include -#include "../os/oro_allocator.hpp" +#include "rtt/os/oro_allocator.hpp" #include // For doing I/O diff --git a/rtt/internal/LockedQueue.hpp b/rtt/internal/LockedQueue.hpp index fd5108431..f012e7765 100644 --- a/rtt/internal/LockedQueue.hpp +++ b/rtt/internal/LockedQueue.hpp @@ -40,8 +40,8 @@ #define ORO_LOCKED_QUEUE_HPP #include -#include "../os/Mutex.hpp" -#include "../os/MutexLock.hpp" +#include "rtt/os/Mutex.hpp" +#include "rtt/os/MutexLock.hpp" namespace RTT { namespace internal { diff --git a/rtt/internal/MWSRQueue.hpp b/rtt/internal/MWSRQueue.hpp index af2303a0e..8b2c4fb0c 100644 --- a/rtt/internal/MWSRQueue.hpp +++ b/rtt/internal/MWSRQueue.hpp @@ -39,7 +39,7 @@ #ifndef ORO_MWSR_QUEUE_HPP #define ORO_MWSR_QUEUE_HPP -#include "../rtt-config.h" +#include "rtt/rtt-config.h" /** * @file MQSRQueue.hpp @@ -48,9 +48,9 @@ * parameters. */ #if defined(OROBLD_OS_NO_ASM) -#include "LockedQueue.hpp" +#include "rtt/internal/LockedQueue.hpp" #else -#include "AtomicMWSRQueue.hpp" +#include "rtt/internal/AtomicMWSRQueue.hpp" #endif namespace RTT diff --git a/rtt/internal/OperationCallerC.cpp b/rtt/internal/OperationCallerC.cpp index 3cc6f6b33..9f17d33d4 100644 --- a/rtt/internal/OperationCallerC.cpp +++ b/rtt/internal/OperationCallerC.cpp @@ -36,12 +36,12 @@ ***************************************************************************/ -#include "OperationCallerC.hpp" -#include "../FactoryExceptions.hpp" -#include "DataSourceCommand.hpp" -#include "../Service.hpp" -#include "../Logger.hpp" -#include "Exceptions.hpp" +#include "rtt/internal/OperationCallerC.hpp" +#include "rtt/FactoryExceptions.hpp" +#include "rtt/internal/DataSourceCommand.hpp" +#include "rtt/Service.hpp" +#include "rtt/Logger.hpp" +#include "rtt/internal/Exceptions.hpp" #include namespace RTT diff --git a/rtt/internal/OperationCallerC.hpp b/rtt/internal/OperationCallerC.hpp index 66b04132f..705e4a1d3 100644 --- a/rtt/internal/OperationCallerC.hpp +++ b/rtt/internal/OperationCallerC.hpp @@ -40,11 +40,11 @@ #define ORO_EXECUTION_METHODC_HPP #include -#include "DataSources.hpp" -#include "../Attribute.hpp" -#include "../rtt-fwd.hpp" -#include "../SendStatus.hpp" -#include "SendHandleC.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/SendStatus.hpp" +#include "rtt/internal/SendHandleC.hpp" namespace RTT { namespace internal { diff --git a/rtt/internal/OperationInterfacePartFused.cpp b/rtt/internal/OperationInterfacePartFused.cpp index ed861791e..92dfd2ba4 100644 --- a/rtt/internal/OperationInterfacePartFused.cpp +++ b/rtt/internal/OperationInterfacePartFused.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "OperationInterfacePartFused.hpp" +#include "rtt/internal/OperationInterfacePartFused.hpp" using namespace std; using namespace RTT; diff --git a/rtt/internal/OperationInterfacePartFused.hpp b/rtt/internal/OperationInterfacePartFused.hpp index 8dfbc4d56..3588b402a 100644 --- a/rtt/internal/OperationInterfacePartFused.hpp +++ b/rtt/internal/OperationInterfacePartFused.hpp @@ -63,13 +63,13 @@ #include #include -#include "DataSource.hpp" -#include "CreateSequence.hpp" -#include "FusedFunctorDataSource.hpp" -#include "../OperationInterfacePart.hpp" -#include "../FactoryExceptions.hpp" -#include "../Operation.hpp" -#include "../base/OperationCallerBase.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/internal/CreateSequence.hpp" +#include "rtt/internal/FusedFunctorDataSource.hpp" +#include "rtt/OperationInterfacePart.hpp" +#include "rtt/FactoryExceptions.hpp" +#include "rtt/Operation.hpp" +#include "rtt/base/OperationCallerBase.hpp" /** * @file OperationInterfacePart.hpp This file contains the code diff --git a/rtt/internal/PartDataSource.hpp b/rtt/internal/PartDataSource.hpp index c7b0d20e3..767d80402 100644 --- a/rtt/internal/PartDataSource.hpp +++ b/rtt/internal/PartDataSource.hpp @@ -39,8 +39,8 @@ #ifndef ORO_PARTDATASOURCE_HPP_ #define ORO_PARTDATASOURCE_HPP_ -#include "DataSource.hpp" -#include "../types/carray.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/types/carray.hpp" namespace RTT { diff --git a/rtt/internal/PortConnectionLock.hpp b/rtt/internal/PortConnectionLock.hpp index de9f08612..2c52ef363 100644 --- a/rtt/internal/PortConnectionLock.hpp +++ b/rtt/internal/PortConnectionLock.hpp @@ -38,7 +38,7 @@ #ifndef ORO_PORT_CONNECTION_LOCK_HPP #define ORO_PORT_CONNECTION_LOCK_HPP -#include "../base/PortInterface.hpp" +#include "rtt/base/PortInterface.hpp" namespace RTT { namespace internal { diff --git a/rtt/internal/Queue.hpp b/rtt/internal/Queue.hpp index b3d97ec73..94258c754 100644 --- a/rtt/internal/Queue.hpp +++ b/rtt/internal/Queue.hpp @@ -38,7 +38,7 @@ #ifndef ORO_QUEUE_HPP #define ORO_QUEUE_HPP -#include "../rtt-config.h" +#include "rtt/rtt-config.h" /** * @file Queue.hpp @@ -47,9 +47,9 @@ * parameters. */ #if defined(OROBLD_OS_NO_ASM) -#include "LockedQueue.hpp" +#include "rtt/internal/LockedQueue.hpp" #else -#include "AtomicQueue.hpp" +#include "rtt/internal/AtomicQueue.hpp" #endif namespace RTT diff --git a/rtt/internal/Reference.hpp b/rtt/internal/Reference.hpp index 36b9acfbf..d8bebade3 100644 --- a/rtt/internal/Reference.hpp +++ b/rtt/internal/Reference.hpp @@ -39,7 +39,7 @@ #ifndef RTT_INTERNAL_REFERENCE_HPP #define RTT_INTERNAL_REFERENCE_HPP -#include "../base/DataSourceBase.hpp" +#include "rtt/base/DataSourceBase.hpp" namespace RTT { diff --git a/rtt/internal/RemoteOperationCaller.hpp b/rtt/internal/RemoteOperationCaller.hpp index e4e1da76f..dce450862 100644 --- a/rtt/internal/RemoteOperationCaller.hpp +++ b/rtt/internal/RemoteOperationCaller.hpp @@ -41,10 +41,10 @@ #include #include -#include "../base/OperationCallerBase.hpp" -#include "OperationCallerC.hpp" -#include "DataSourceStorage.hpp" -#include "Invoker.hpp" +#include "rtt/base/OperationCallerBase.hpp" +#include "rtt/internal/OperationCallerC.hpp" +#include "rtt/internal/DataSourceStorage.hpp" +#include "rtt/internal/Invoker.hpp" #include #include diff --git a/rtt/internal/Return.hpp b/rtt/internal/Return.hpp index 46f378df5..09d586ad1 100644 --- a/rtt/internal/Return.hpp +++ b/rtt/internal/Return.hpp @@ -39,7 +39,7 @@ #ifndef ORO_RETURN_HPP #define ORO_RETURN_HPP -#include "Collect.hpp" +#include "rtt/internal/Collect.hpp" namespace RTT { diff --git a/rtt/internal/ReturnSignature.hpp b/rtt/internal/ReturnSignature.hpp index 56a870d16..a20c14ba7 100644 --- a/rtt/internal/ReturnSignature.hpp +++ b/rtt/internal/ReturnSignature.hpp @@ -40,8 +40,8 @@ #define ORO_RETURN_SIGNATURE_HPP #include -#include "NA.hpp" -#include "../rtt-fwd.hpp" +#include "rtt/internal/NA.hpp" +#include "rtt/rtt-fwd.hpp" namespace RTT { diff --git a/rtt/internal/SendHandleC.cpp b/rtt/internal/SendHandleC.cpp index 949982b85..abc50e2e5 100644 --- a/rtt/internal/SendHandleC.cpp +++ b/rtt/internal/SendHandleC.cpp @@ -36,12 +36,12 @@ ***************************************************************************/ -#include "SendHandleC.hpp" -#include "../FactoryExceptions.hpp" -#include "DataSourceCommand.hpp" -#include "../Service.hpp" -#include "../Logger.hpp" -#include "Exceptions.hpp" +#include "rtt/internal/SendHandleC.hpp" +#include "rtt/FactoryExceptions.hpp" +#include "rtt/internal/DataSourceCommand.hpp" +#include "rtt/Service.hpp" +#include "rtt/Logger.hpp" +#include "rtt/internal/Exceptions.hpp" #include namespace RTT diff --git a/rtt/internal/SendHandleC.hpp b/rtt/internal/SendHandleC.hpp index 445af37cb..8eeeb41d4 100644 --- a/rtt/internal/SendHandleC.hpp +++ b/rtt/internal/SendHandleC.hpp @@ -41,10 +41,10 @@ #include #include -#include "DataSources.hpp" -#include "../Attribute.hpp" -#include "../rtt-fwd.hpp" -#include "../SendStatus.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/SendStatus.hpp" namespace RTT { namespace internal { diff --git a/rtt/internal/SharedConnection.cpp b/rtt/internal/SharedConnection.cpp index ac1826373..8995ccb82 100644 --- a/rtt/internal/SharedConnection.cpp +++ b/rtt/internal/SharedConnection.cpp @@ -35,9 +35,9 @@ * * ***************************************************************************/ -#include "SharedConnection.hpp" -#include "../os/MutexLock.hpp" -#include "../Logger.hpp" +#include "rtt/internal/SharedConnection.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/Logger.hpp" #if defined(ORO_HAVE_BOOST_UUID) #include diff --git a/rtt/internal/SharedConnection.hpp b/rtt/internal/SharedConnection.hpp index cb28ba2a1..d3ae4a8fb 100644 --- a/rtt/internal/SharedConnection.hpp +++ b/rtt/internal/SharedConnection.hpp @@ -38,9 +38,9 @@ #ifndef ORO_SHARED_CONNECTION_HPP #define ORO_SHARED_CONNECTION_HPP -#include "ConnID.hpp" -#include "../base/ChannelElement.hpp" -#include "../ConnPolicy.hpp" +#include "rtt/internal/ConnID.hpp" +#include "rtt/base/ChannelElement.hpp" +#include "rtt/ConnPolicy.hpp" #include diff --git a/rtt/internal/Signal.hpp b/rtt/internal/Signal.hpp index a0aadb7af..c66449b55 100644 --- a/rtt/internal/Signal.hpp +++ b/rtt/internal/Signal.hpp @@ -43,15 +43,15 @@ #include #include -#include "../Handle.hpp" -#include "signal0.hpp" -#include "signal1.hpp" -#include "signal2.hpp" -#include "signal3.hpp" -#include "signal4.hpp" -#include "signal5.hpp" -#include "signal6.hpp" -#include "signal7.hpp" +#include "rtt/Handle.hpp" +#include "rtt/internal/signal0.hpp" +#include "rtt/internal/signal1.hpp" +#include "rtt/internal/signal2.hpp" +#include "rtt/internal/signal3.hpp" +#include "rtt/internal/signal4.hpp" +#include "rtt/internal/signal5.hpp" +#include "rtt/internal/signal6.hpp" +#include "rtt/internal/signal7.hpp" namespace RTT { namespace internal { diff --git a/rtt/internal/SignalBase.cpp b/rtt/internal/SignalBase.cpp index fbf374f96..61f7ff22b 100644 --- a/rtt/internal/SignalBase.cpp +++ b/rtt/internal/SignalBase.cpp @@ -36,12 +36,12 @@ ***************************************************************************/ -#include "SignalBase.hpp" +#include "rtt/internal/SignalBase.hpp" #include #ifdef ORO_SIGNAL_USE_LIST_LOCK_FREE #else -#include "../os/MutexLock.hpp" +#include "rtt/os/MutexLock.hpp" #endif namespace RTT { diff --git a/rtt/internal/SignalBase.hpp b/rtt/internal/SignalBase.hpp index 6cebe2c25..90c17c7ed 100644 --- a/rtt/internal/SignalBase.hpp +++ b/rtt/internal/SignalBase.hpp @@ -42,7 +42,7 @@ #include #include -#include "../rtt-config.h" +#include "rtt/rtt-config.h" #if defined(OROBLD_OS_NO_ASM) #define ORO_SIGNAL_USE_RT_LIST @@ -50,16 +50,16 @@ #define ORO_SIGNAL_USE_LIST_LOCK_FREE #endif -#include "../os/Atomic.hpp" +#include "rtt/os/Atomic.hpp" #ifdef ORO_SIGNAL_USE_LIST_LOCK_FREE -#include "ListLockFree.hpp" +#include "rtt/internal/ListLockFree.hpp" #include #else #ifdef ORO_SIGNAL_USE_RT_LIST -#include "../os/Mutex.hpp" -#include "../os/rt_list.hpp" +#include "rtt/os/Mutex.hpp" +#include "rtt/os/rt_list.hpp" #else -#include "../os/Mutex.hpp" +#include "rtt/os/Mutex.hpp" #include #endif #endif diff --git a/rtt/internal/TsPool.hpp b/rtt/internal/TsPool.hpp index 251d6bfb2..f785ba5fc 100644 --- a/rtt/internal/TsPool.hpp +++ b/rtt/internal/TsPool.hpp @@ -46,7 +46,7 @@ #ifndef RTT_TSPOOL_HPP_ #define RTT_TSPOOL_HPP_ -#include "../os/CAS.hpp" +#include "rtt/os/CAS.hpp" #include namespace RTT diff --git a/rtt/internal/carray.hpp b/rtt/internal/carray.hpp index 1ec569696..4a83567d3 100644 --- a/rtt/internal/carray.hpp +++ b/rtt/internal/carray.hpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "../types/carray.hpp" +#include "rtt/types/carray.hpp" // For backwards compatibility, only in 2.2.x: namespace RTT { namespace internal { using types::carray; } } diff --git a/rtt/internal/signal0.hpp b/rtt/internal/signal0.hpp index 452d97bc0..7202f56c6 100644 --- a/rtt/internal/signal0.hpp +++ b/rtt/internal/signal0.hpp @@ -41,7 +41,7 @@ #define OROCOS_SIGNAL_SIGNAL0_HEADER #define OROCOS_SIGNATURE_TEMPLATE_HEADER "signal_template.hpp" -#include "signature0.hpp" +#include "rtt/internal/signature0.hpp" #undef OROCOS_SIGNATURE_TEMPLATE_HEADER #endif // OROCOS_SIGNAL_SIGNAL0_HEADER diff --git a/rtt/internal/signal1.hpp b/rtt/internal/signal1.hpp index 8f4d72493..bbab8c1c0 100644 --- a/rtt/internal/signal1.hpp +++ b/rtt/internal/signal1.hpp @@ -41,7 +41,7 @@ #define OROCOS_SIGNAL_SIGNAL1_HEADER #define OROCOS_SIGNATURE_TEMPLATE_HEADER "signal_template.hpp" -#include "signature1.hpp" +#include "rtt/internal/signature1.hpp" #undef OROCOS_SIGNATURE_TEMPLATE_HEADER #endif // OROCOS_SIGNAL_SIGNAL1_HEADER diff --git a/rtt/internal/signal2.hpp b/rtt/internal/signal2.hpp index 86f637c58..e51e84366 100644 --- a/rtt/internal/signal2.hpp +++ b/rtt/internal/signal2.hpp @@ -41,7 +41,7 @@ #define OROCOS_SIGNAL_SIGNAL2_HEADER #define OROCOS_SIGNATURE_TEMPLATE_HEADER "signal_template.hpp" -#include "signature2.hpp" +#include "rtt/internal/signature2.hpp" #undef OROCOS_SIGNATURE_TEMPLATE_HEADER #endif // OROCOS_SIGNAL_SIGNAL2_HEADER diff --git a/rtt/internal/signal3.hpp b/rtt/internal/signal3.hpp index 3a293a611..a0a77b30e 100644 --- a/rtt/internal/signal3.hpp +++ b/rtt/internal/signal3.hpp @@ -41,7 +41,7 @@ #define OROCOS_SIGNAL_SIGNAL3_HEADER #define OROCOS_SIGNATURE_TEMPLATE_HEADER "signal_template.hpp" -#include "signature3.hpp" +#include "rtt/internal/signature3.hpp" #undef OROCOS_SIGNATURE_TEMPLATE_HEADER #endif // OROCOS_SIGNAL_SIGNAL3_HEADER diff --git a/rtt/internal/signal4.hpp b/rtt/internal/signal4.hpp index 0ef05c201..52eff39c4 100644 --- a/rtt/internal/signal4.hpp +++ b/rtt/internal/signal4.hpp @@ -40,7 +40,7 @@ #define OROCOS_SIGNAL_SIGNAL4_HEADER #define OROCOS_SIGNATURE_TEMPLATE_HEADER "signal_template.hpp" -#include "signature4.hpp" +#include "rtt/internal/signature4.hpp" #undef OROCOS_SIGNATURE_TEMPLATE_HEADER #endif // OROCOS_SIGNAL_SIGNAL4_HEADER diff --git a/rtt/internal/signal5.hpp b/rtt/internal/signal5.hpp index 1efe14a89..2cbb10f49 100644 --- a/rtt/internal/signal5.hpp +++ b/rtt/internal/signal5.hpp @@ -40,7 +40,7 @@ #define OROCOS_SIGNAL_SIGNAL5_HEADER #define OROCOS_SIGNATURE_TEMPLATE_HEADER "signal_template.hpp" -#include "signature5.hpp" +#include "rtt/internal/signature5.hpp" #undef OROCOS_SIGNATURE_TEMPLATE_HEADER #endif // OROCOS_SIGNAL_SIGNAL5_HEADER diff --git a/rtt/internal/signal6.hpp b/rtt/internal/signal6.hpp index 8b1099024..3e3b77541 100644 --- a/rtt/internal/signal6.hpp +++ b/rtt/internal/signal6.hpp @@ -40,7 +40,7 @@ #define OROCOS_SIGNAL_SIGNAL6_HEADER #define OROCOS_SIGNATURE_TEMPLATE_HEADER "signal_template.hpp" -#include "signature6.hpp" +#include "rtt/internal/signature6.hpp" #undef OROCOS_SIGNATURE_TEMPLATE_HEADER #endif // OROCOS_SIGNAL_SIGNAL6_HEADER diff --git a/rtt/internal/signal7.hpp b/rtt/internal/signal7.hpp index f605c5ee7..a52de6907 100644 --- a/rtt/internal/signal7.hpp +++ b/rtt/internal/signal7.hpp @@ -40,7 +40,7 @@ #define OROCOS_SIGNAL_SIGNAL7_HEADER #define OROCOS_SIGNATURE_TEMPLATE_HEADER "signal_template.hpp" -#include "signature7.hpp" +#include "rtt/internal/signature7.hpp" #undef OROCOS_SIGNATURE_TEMPLATE_HEADER #endif // OROCOS_SIGNAL_SIGNAL7_HEADER diff --git a/rtt/internal/signal_template.hpp b/rtt/internal/signal_template.hpp index 60d90a9a3..832b2e669 100644 --- a/rtt/internal/signal_template.hpp +++ b/rtt/internal/signal_template.hpp @@ -39,13 +39,13 @@ #ifndef OROCOS_SIGNAL_TEMPLATE_HEADER_INCLUDED #define OROCOS_SIGNAL_TEMPLATE_HEADER_INCLUDED -#include "SignalBase.hpp" -#include "NA.hpp" +#include "rtt/internal/SignalBase.hpp" +#include "rtt/internal/NA.hpp" #ifdef ORO_SIGNAL_USE_LIST_LOCK_FREE #include #else -#include "../os/MutexLock.hpp" +#include "rtt/os/MutexLock.hpp" #endif #endif // !OROCOS_SIGNAL_TEMPLATE_HEADER_INCLUDED diff --git a/rtt/internal/signature0.hpp b/rtt/internal/signature0.hpp index 50fe3bf50..cc196c454 100644 --- a/rtt/internal/signature0.hpp +++ b/rtt/internal/signature0.hpp @@ -44,7 +44,7 @@ #define OROCOS_SIGNATURE_ARG_TYPES #define OROCOS_SIGNATURE_TYPEDEFS -#include "signature_template.hpp" +#include "rtt/internal/signature_template.hpp" #undef OROCOS_SIGNATURE_TYPEDEFS #undef OROCOS_SIGNATURE_ARG_TYPES diff --git a/rtt/internal/signature1.hpp b/rtt/internal/signature1.hpp index 663c94d8c..c88b32b38 100644 --- a/rtt/internal/signature1.hpp +++ b/rtt/internal/signature1.hpp @@ -44,7 +44,7 @@ #define OROCOS_SIGNATURE_ARG_TYPES typedef T1 arg1_type; #define OROCOS_SIGNATURE_TYPEDEFS typedef typename function_type::arg1_type arg1_type; -#include "signature_template.hpp" +#include "rtt/internal/signature_template.hpp" #undef OROCOS_SIGNATURE_TYPEDEFS #undef OROCOS_SIGNATURE_ARG_TYPES diff --git a/rtt/internal/signature2.hpp b/rtt/internal/signature2.hpp index 36cc19551..79538e17a 100644 --- a/rtt/internal/signature2.hpp +++ b/rtt/internal/signature2.hpp @@ -44,7 +44,7 @@ #define OROCOS_SIGNATURE_ARG_TYPES typedef T1 arg1_type;typedef T2 arg2_type; #define OROCOS_SIGNATURE_TYPEDEFS typedef typename function_type::arg1_type arg1_type;typedef typename function_type::arg2_type arg2_type; -#include "signature_template.hpp" +#include "rtt/internal/signature_template.hpp" #undef OROCOS_SIGNATURE_TYPEDEFS #undef OROCOS_SIGNATURE_ARG_TYPES diff --git a/rtt/internal/signature3.hpp b/rtt/internal/signature3.hpp index 0b9726fae..73b1ed9f3 100644 --- a/rtt/internal/signature3.hpp +++ b/rtt/internal/signature3.hpp @@ -44,7 +44,7 @@ #define OROCOS_SIGNATURE_ARG_TYPES typedef T1 arg1_type;typedef T2 arg2_type;typedef T3 arg3_type; #define OROCOS_SIGNATURE_TYPEDEFS typedef typename function_type::arg1_type arg1_type;typedef typename function_type::arg2_type arg2_type;typedef typename function_type::arg3_type arg3_type; -#include "signature_template.hpp" +#include "rtt/internal/signature_template.hpp" #undef OROCOS_SIGNATURE_TYPEDEFS #undef OROCOS_SIGNATURE_ARG_TYPES diff --git a/rtt/internal/signature4.hpp b/rtt/internal/signature4.hpp index 777c28fd0..100f185ff 100644 --- a/rtt/internal/signature4.hpp +++ b/rtt/internal/signature4.hpp @@ -44,7 +44,7 @@ #define OROCOS_SIGNATURE_ARG_TYPES typedef T1 arg1_type;typedef T2 arg2_type;typedef T3 arg3_type;typedef T4 arg4_type; #define OROCOS_SIGNATURE_TYPEDEFS typedef typename function_type::arg1_type arg1_type;typedef typename function_type::arg2_type arg2_type;typedef typename function_type::arg3_type arg3_type;typedef typename function_type::arg4_type arg4_type; -#include "signature_template.hpp" +#include "rtt/internal/signature_template.hpp" #undef OROCOS_SIGNATURE_TYPEDEFS #undef OROCOS_SIGNATURE_ARG_TYPES diff --git a/rtt/internal/signature5.hpp b/rtt/internal/signature5.hpp index 73ae7ba20..e073f5761 100644 --- a/rtt/internal/signature5.hpp +++ b/rtt/internal/signature5.hpp @@ -44,7 +44,7 @@ #define OROCOS_SIGNATURE_ARG_TYPES typedef T1 arg1_type;typedef T2 arg2_type;typedef T3 arg3_type;typedef T4 arg4_type;typedef T5 arg5_type; #define OROCOS_SIGNATURE_TYPEDEFS typedef typename function_type::arg1_type arg1_type;typedef typename function_type::arg2_type arg2_type;typedef typename function_type::arg3_type arg3_type;typedef typename function_type::arg4_type arg4_type;typedef typename function_type::arg5_type arg5_type; -#include "signature_template.hpp" +#include "rtt/internal/signature_template.hpp" #undef OROCOS_SIGNATURE_TYPEDEFS #undef OROCOS_SIGNATURE_ARG_TYPES diff --git a/rtt/internal/signature6.hpp b/rtt/internal/signature6.hpp index e0ab0737d..6875394ed 100644 --- a/rtt/internal/signature6.hpp +++ b/rtt/internal/signature6.hpp @@ -44,7 +44,7 @@ #define OROCOS_SIGNATURE_ARG_TYPES typedef T1 arg1_type;typedef T2 arg2_type;typedef T3 arg3_type;typedef T4 arg4_type;typedef T5 arg5_type;typedef T6 arg6_type; #define OROCOS_SIGNATURE_TYPEDEFS typedef typename function_type::arg1_type arg1_type;typedef typename function_type::arg2_type arg2_type;typedef typename function_type::arg3_type arg3_type;typedef typename function_type::arg4_type arg4_type;typedef typename function_type::arg5_type arg5_type;typedef typename function_type::arg6_type arg6_type; -#include "signature_template.hpp" +#include "rtt/internal/signature_template.hpp" #undef OROCOS_SIGNATURE_TYPEDEFS #undef OROCOS_SIGNATURE_ARG_TYPES diff --git a/rtt/internal/signature7.hpp b/rtt/internal/signature7.hpp index 70c02a502..ab6bf2123 100644 --- a/rtt/internal/signature7.hpp +++ b/rtt/internal/signature7.hpp @@ -44,7 +44,7 @@ #define OROCOS_SIGNATURE_ARG_TYPES typedef T1 arg1_type;typedef T2 arg2_type;typedef T3 arg3_type;typedef T4 arg4_type;typedef T5 arg5_type;typedef T6 arg6_type;typedef T7 arg7_type; #define OROCOS_SIGNATURE_TYPEDEFS typedef typename function_type::arg1_type arg1_type;typedef typename function_type::arg2_type arg2_type;typedef typename function_type::arg3_type arg3_type;typedef typename function_type::arg4_type arg4_type;typedef typename function_type::arg5_type arg5_type;typedef typename function_type::arg6_type arg6_type;typedef typename function_type::arg7_type arg7_type; -#include "signature_template.hpp" +#include "rtt/internal/signature_template.hpp" #undef OROCOS_SIGNATURE_TYPEDEFS #undef OROCOS_SIGNATURE_ARG_TYPES diff --git a/rtt/internal/signature_template.hpp b/rtt/internal/signature_template.hpp index 34ac9d362..d91118fd9 100644 --- a/rtt/internal/signature_template.hpp +++ b/rtt/internal/signature_template.hpp @@ -50,7 +50,7 @@ #endif // OROCOS_NUM_ARGS > 0 // Include template. -#include "signal_template.hpp" +#include "rtt/internal/signal_template.hpp" #undef OROCOS_SIGNATURE_COMMA_IF_NONZERO_ARGS #undef OROCOS_SIGNATURE_FUNCTION_N_HEADER diff --git a/rtt/marsh/CPFDTD.cpp b/rtt/marsh/CPFDTD.cpp index abd342ea7..b49268783 100644 --- a/rtt/marsh/CPFDTD.cpp +++ b/rtt/marsh/CPFDTD.cpp @@ -37,7 +37,7 @@ -#include "CPFDTD.hpp" +#include "rtt/marsh/CPFDTD.hpp" namespace RTT { namespace marsh diff --git a/rtt/marsh/CPFDemarshaller.cpp b/rtt/marsh/CPFDemarshaller.cpp index a5af978b4..abf3b51ec 100644 --- a/rtt/marsh/CPFDemarshaller.cpp +++ b/rtt/marsh/CPFDemarshaller.cpp @@ -37,8 +37,8 @@ -#include "CPFDemarshaller.hpp" -#include "CPFDTD.hpp" +#include "rtt/marsh/CPFDemarshaller.hpp" +#include "rtt/marsh/CPFDTD.hpp" #ifdef OROPKG_SUPPORT_XERCES_C #include @@ -60,9 +60,9 @@ #include #include -#include -#include "../base/PropertyIntrospection.hpp" -#include +#include "rtt/Property.hpp" +#include "rtt/base/PropertyIntrospection.hpp" +#include "rtt/Logger.hpp" namespace RTT { diff --git a/rtt/marsh/CPFDemarshaller.hpp b/rtt/marsh/CPFDemarshaller.hpp index ac1f24d7f..8b1e28b46 100644 --- a/rtt/marsh/CPFDemarshaller.hpp +++ b/rtt/marsh/CPFDemarshaller.hpp @@ -38,13 +38,13 @@ #ifndef PI_PROPERTIES_CPFDESERIALIZER #define PI_PROPERTIES_CPFDESERIALIZER -#include "rtt-marsh-config.h" +#include "rtt/marsh/rtt-marsh-config.h" #ifdef OROPKG_SUPPORT_XERCES_C #include #include -#include "MarshallInterface.hpp" +#include "rtt/marsh/MarshallInterface.hpp" namespace RTT { namespace marsh { diff --git a/rtt/marsh/CPFMarshaller.cpp b/rtt/marsh/CPFMarshaller.cpp index 50174709b..89e1c6ac1 100644 --- a/rtt/marsh/CPFMarshaller.cpp +++ b/rtt/marsh/CPFMarshaller.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "CPFMarshaller.hpp" -#include "../rtt-config.h" +#include "rtt/marsh/CPFMarshaller.hpp" +#include "rtt/rtt-config.h" #include using namespace std; diff --git a/rtt/marsh/CPFMarshaller.hpp b/rtt/marsh/CPFMarshaller.hpp index 65e73ed4a..c3b27d2ce 100644 --- a/rtt/marsh/CPFMarshaller.hpp +++ b/rtt/marsh/CPFMarshaller.hpp @@ -41,10 +41,10 @@ #include #include #include -#include "MarshallInterface.hpp" -#include "../Property.hpp" -#include "../base/PropertyIntrospection.hpp" -#include "StreamProcessor.hpp" +#include "rtt/marsh/MarshallInterface.hpp" +#include "rtt/Property.hpp" +#include "rtt/base/PropertyIntrospection.hpp" +#include "rtt/marsh/StreamProcessor.hpp" namespace RTT { namespace marsh { diff --git a/rtt/marsh/MarshallInterface.hpp b/rtt/marsh/MarshallInterface.hpp index bed596dc2..3af2e9095 100644 --- a/rtt/marsh/MarshallInterface.hpp +++ b/rtt/marsh/MarshallInterface.hpp @@ -39,8 +39,8 @@ #define PI_PROPERTIES_MARSHALLER #include -#include "../marsh/rtt-marsh-config.h" -#include "../rtt-fwd.hpp" +#include "rtt/marsh/rtt-marsh-config.h" +#include "rtt/rtt-fwd.hpp" namespace RTT { namespace marsh { diff --git a/rtt/marsh/Marshalling.cpp b/rtt/marsh/Marshalling.cpp index 7ec7826a1..428be8008 100644 --- a/rtt/marsh/Marshalling.cpp +++ b/rtt/marsh/Marshalling.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "Marshalling.hpp" +#include "rtt/marsh/Marshalling.hpp" namespace RTT { diff --git a/rtt/marsh/Marshalling.hpp b/rtt/marsh/Marshalling.hpp index a80336c06..4cd73032a 100644 --- a/rtt/marsh/Marshalling.hpp +++ b/rtt/marsh/Marshalling.hpp @@ -40,10 +40,10 @@ #define ORO_MARSHALLING_HPP_ #include -#include "../marsh/rtt-marsh-config.h" -#include "../rtt-fwd.hpp" -#include "../ServiceRequester.hpp" -#include "../OperationCaller.hpp" +#include "rtt/marsh/rtt-marsh-config.h" +#include "rtt/rtt-fwd.hpp" +#include "rtt/ServiceRequester.hpp" +#include "rtt/OperationCaller.hpp" namespace RTT { diff --git a/rtt/marsh/MarshallingService.cpp b/rtt/marsh/MarshallingService.cpp index 96d3cff2b..a04f6ff2f 100644 --- a/rtt/marsh/MarshallingService.cpp +++ b/rtt/marsh/MarshallingService.cpp @@ -37,15 +37,15 @@ -#include "MarshallingService.hpp" -#include "../TaskContext.hpp" -#include "../plugin/ServicePlugin.hpp" +#include "rtt/marsh/MarshallingService.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/plugin/ServicePlugin.hpp" -#include "rtt-config.h" +#include "rtt/rtt-config.h" #if !defined(ORO_EMBEDDED) -#include "../OperationCaller.hpp" +#include "rtt/OperationCaller.hpp" #endif -#include "PropertyLoader.hpp" +#include "rtt/marsh/PropertyLoader.hpp" //ORO_SERVICE_PLUGIN( RTT::marsh::MarshallingService ) ORO_SERVICE_NAMED_PLUGIN(RTT::marsh::MarshallingService, "marshalling") diff --git a/rtt/marsh/MarshallingService.hpp b/rtt/marsh/MarshallingService.hpp index 6687ff5a8..4324cb98d 100644 --- a/rtt/marsh/MarshallingService.hpp +++ b/rtt/marsh/MarshallingService.hpp @@ -41,9 +41,9 @@ #define ORO_MARSHALLING_ACCESS_HPP #include -#include "../marsh/rtt-marsh-config.h" -#include "../rtt-fwd.hpp" -#include "../Service.hpp" +#include "rtt/marsh/rtt-marsh-config.h" +#include "rtt/rtt-fwd.hpp" +#include "rtt/Service.hpp" namespace RTT { namespace marsh { diff --git a/rtt/marsh/PropertyBagIntrospector.cpp b/rtt/marsh/PropertyBagIntrospector.cpp index ae938f5fb..4da2b69e6 100644 --- a/rtt/marsh/PropertyBagIntrospector.cpp +++ b/rtt/marsh/PropertyBagIntrospector.cpp @@ -35,8 +35,8 @@ * * ***************************************************************************/ -#include "PropertyBagIntrospector.hpp" -#include "../types/Types.hpp" +#include "rtt/marsh/PropertyBagIntrospector.hpp" +#include "rtt/types/Types.hpp" using namespace RTT; using namespace RTT::detail; diff --git a/rtt/marsh/PropertyBagIntrospector.hpp b/rtt/marsh/PropertyBagIntrospector.hpp index 566f20f58..febc405e3 100644 --- a/rtt/marsh/PropertyBagIntrospector.hpp +++ b/rtt/marsh/PropertyBagIntrospector.hpp @@ -38,11 +38,11 @@ #ifndef PROPERTYBAGINTROSPECTOR_HPP #define PROPERTYBAGINTROSPECTOR_HPP -#include "../marsh/rtt-marsh-config.h" -#include "../PropertyBag.hpp" -#include "../Property.hpp" -#include "../base/PropertyIntrospection.hpp" -#include "../types/PropertyDecomposition.hpp" +#include "rtt/marsh/rtt-marsh-config.h" +#include "rtt/PropertyBag.hpp" +#include "rtt/Property.hpp" +#include "rtt/base/PropertyIntrospection.hpp" +#include "rtt/types/PropertyDecomposition.hpp" #include namespace RTT diff --git a/rtt/marsh/PropertyDemarshaller.cpp b/rtt/marsh/PropertyDemarshaller.cpp index e129df078..58e91a0b1 100644 --- a/rtt/marsh/PropertyDemarshaller.cpp +++ b/rtt/marsh/PropertyDemarshaller.cpp @@ -37,15 +37,15 @@ -#include "PropertyDemarshaller.hpp" -#include "rtt-marsh-config.h" +#include "rtt/marsh/PropertyDemarshaller.hpp" +#include "rtt/marsh/rtt-marsh-config.h" #ifdef ORODAT_CORELIB_PROPERTIES_DEMARSHALLING_INCLUDE #include ORODAT_CORELIB_PROPERTIES_DEMARSHALLING_INCLUDE #endif -#include -#include +#include "rtt/Property.hpp" +#include "rtt/Logger.hpp" namespace RTT { diff --git a/rtt/marsh/PropertyDemarshaller.hpp b/rtt/marsh/PropertyDemarshaller.hpp index 7fac19788..185c6d030 100644 --- a/rtt/marsh/PropertyDemarshaller.hpp +++ b/rtt/marsh/PropertyDemarshaller.hpp @@ -40,7 +40,7 @@ #ifndef PROPERTY_DEMARSHALLER #define PROPERTY_DEMARSHALLER -#include "MarshallInterface.hpp" +#include "rtt/marsh/MarshallInterface.hpp" #include namespace RTT diff --git a/rtt/marsh/PropertyLoader.cpp b/rtt/marsh/PropertyLoader.cpp index 00abd876c..8ea1b853c 100644 --- a/rtt/marsh/PropertyLoader.cpp +++ b/rtt/marsh/PropertyLoader.cpp @@ -37,16 +37,16 @@ -#include "PropertyLoader.hpp" -#include "rtt-config.h" +#include "rtt/marsh/PropertyLoader.hpp" +#include "rtt/rtt-config.h" #ifdef OROPKG_CORELIB_PROPERTIES_MARSHALLING #include ORODAT_CORELIB_PROPERTIES_MARSHALLING_INCLUDE #include ORODAT_CORELIB_PROPERTIES_DEMARSHALLING_INCLUDE #endif -#include "../Logger.hpp" -#include "../TaskContext.hpp" -#include "PropertyBagIntrospector.hpp" -#include "../types/PropertyComposition.hpp" +#include "rtt/Logger.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/marsh/PropertyBagIntrospector.hpp" +#include "rtt/types/PropertyComposition.hpp" #include using namespace std; diff --git a/rtt/marsh/PropertyLoader.hpp b/rtt/marsh/PropertyLoader.hpp index 814dc643f..7b244e056 100644 --- a/rtt/marsh/PropertyLoader.hpp +++ b/rtt/marsh/PropertyLoader.hpp @@ -40,8 +40,8 @@ #define ORO_PROPERTY_LOADER_HPP #include -#include "../marsh/rtt-marsh-config.h" -#include "../rtt-fwd.hpp" +#include "rtt/marsh/rtt-marsh-config.h" +#include "rtt/rtt-fwd.hpp" namespace RTT { namespace marsh { diff --git a/rtt/marsh/PropertyMarshaller.cpp b/rtt/marsh/PropertyMarshaller.cpp index eafccdfc3..57bc2f420 100644 --- a/rtt/marsh/PropertyMarshaller.cpp +++ b/rtt/marsh/PropertyMarshaller.cpp @@ -36,14 +36,14 @@ ***************************************************************************/ -#include "PropertyMarshaller.hpp" -#include "rtt-config.h" +#include "rtt/marsh/PropertyMarshaller.hpp" +#include "rtt/rtt-config.h" #ifdef ORODAT_CORELIB_PROPERTIES_MARSHALLING_INCLUDE #include ORODAT_CORELIB_PROPERTIES_MARSHALLING_INCLUDE #endif -#include +#include "rtt/Logger.hpp" #include namespace RTT { diff --git a/rtt/marsh/PropertyMarshaller.hpp b/rtt/marsh/PropertyMarshaller.hpp index 7138a8d2e..8a815b723 100644 --- a/rtt/marsh/PropertyMarshaller.hpp +++ b/rtt/marsh/PropertyMarshaller.hpp @@ -40,7 +40,7 @@ #define PROPERTY_MARSHALLER_HPP #include -#include "MarshallInterface.hpp" +#include "rtt/marsh/MarshallInterface.hpp" namespace RTT { namespace marsh { diff --git a/rtt/marsh/TinyDemarshaller.cpp b/rtt/marsh/TinyDemarshaller.cpp index 5d90c422e..0440672d9 100644 --- a/rtt/marsh/TinyDemarshaller.cpp +++ b/rtt/marsh/TinyDemarshaller.cpp @@ -36,12 +36,12 @@ ***************************************************************************/ -#include "TinyDemarshaller.hpp" +#include "rtt/marsh/TinyDemarshaller.hpp" // Modified tinyxml* to include it in the RTT namespace to avoid clashes // with possible other libraries. -#include "tinyxml.h" +#include "rtt/marsh/tinyxml.h" // This is currently not defined: #ifdef TIXML_USE_STL @@ -53,9 +53,9 @@ using namespace std; #endif #include -#include -#include -#include +#include "rtt/Property.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/Logger.hpp" namespace RTT { diff --git a/rtt/marsh/TinyDemarshaller.hpp b/rtt/marsh/TinyDemarshaller.hpp index d542474bd..4b84be515 100644 --- a/rtt/marsh/TinyDemarshaller.hpp +++ b/rtt/marsh/TinyDemarshaller.hpp @@ -39,7 +39,7 @@ #ifndef PROPERTIES_TINY_DEMARSHALLER #define PROPERTIES_TINY_DEMARSHALLER -#include "MarshallInterface.hpp" +#include "rtt/marsh/MarshallInterface.hpp" #include namespace RTT diff --git a/rtt/marsh/XMLRPCDemarshaller.hpp b/rtt/marsh/XMLRPCDemarshaller.hpp index 4bb151ea5..56a46f7ef 100644 --- a/rtt/marsh/XMLRPCDemarshaller.hpp +++ b/rtt/marsh/XMLRPCDemarshaller.hpp @@ -54,9 +54,9 @@ #include #include #include -#include "../Property.hpp" -#include "StreamProcessor.hpp" -#include "MarshallInterface.hpp" +#include "rtt/Property.hpp" +#include "rtt/marsh/StreamProcessor.hpp" +#include "rtt/marsh/MarshallInterface.hpp" #include namespace RTT diff --git a/rtt/marsh/XMLRPCMarshaller.hpp b/rtt/marsh/XMLRPCMarshaller.hpp index a2cd4f651..2b40e70f5 100644 --- a/rtt/marsh/XMLRPCMarshaller.hpp +++ b/rtt/marsh/XMLRPCMarshaller.hpp @@ -42,10 +42,10 @@ #include #include #include -#include "../Property.hpp" -#include "../base/PropertyIntrospection.hpp" -#include "MarshallInterface.hpp" -#include "StreamProcessor.hpp" +#include "rtt/Property.hpp" +#include "rtt/base/PropertyIntrospection.hpp" +#include "rtt/marsh/MarshallInterface.hpp" +#include "rtt/marsh/StreamProcessor.hpp" namespace RTT diff --git a/rtt/marsh/rtt-marsh-config.h.in b/rtt/marsh/rtt-marsh-config.h.in index a01484788..414b0e7ed 100644 --- a/rtt/marsh/rtt-marsh-config.h.in +++ b/rtt/marsh/rtt-marsh-config.h.in @@ -40,7 +40,7 @@ #ifndef RTT_MARSH_CONFIG_H #define RTT_MARSH_CONFIG_H -#include "../rtt-config.h" +#include "rtt/rtt-config.h" // // See: @@ -70,11 +70,11 @@ # if defined(RTT_MARSH_DLL_EXPORT) # define RTT_MARSH_API __declspec(dllexport) # define RTT_MARSH_EXPORT __declspec(dllexport) -# define RTT_MARSH_HIDE +# define RTT_MARSH_HIDE # else # define RTT_MARSH_API __declspec(dllimport) # define RTT_MARSH_EXPORT __declspec(dllexport) -# define RTT_MARSH_HIDE +# define RTT_MARSH_HIDE # endif # else # define RTT_MARSH_API diff --git a/rtt/marsh/tinyxml.cpp b/rtt/marsh/tinyxml.cpp index 7cf05ee1f..7a7726a80 100644 --- a/rtt/marsh/tinyxml.cpp +++ b/rtt/marsh/tinyxml.cpp @@ -61,7 +61,7 @@ distribution. */ #include -#include "tinyxml.h" +#include "rtt/marsh/tinyxml.h" #ifdef TIXML_USE_STL #include diff --git a/rtt/marsh/tinyxml.h b/rtt/marsh/tinyxml.h index 9af6e2d14..f2cc18a68 100644 --- a/rtt/marsh/tinyxml.h +++ b/rtt/marsh/tinyxml.h @@ -88,7 +88,7 @@ distribution. #define TIXML_ISTREAM std::istream #define TIXML_OSTREAM std::ostream #else - #include "tinystr.h" + #include "rtt/marsh/tinystr.h" #define TIXML_STRING TiXmlString #define TIXML_OSTREAM TiXmlOutStream #endif diff --git a/rtt/marsh/tinyxmlerror.cpp b/rtt/marsh/tinyxmlerror.cpp index 173c3a68f..c1bd43704 100644 --- a/rtt/marsh/tinyxmlerror.cpp +++ b/rtt/marsh/tinyxmlerror.cpp @@ -60,7 +60,7 @@ must not be misrepresented as being the original software. distribution. */ -#include "tinyxml.h" +#include "rtt/marsh/tinyxml.h" // The goal of the seperate error file is to make the first // step towards localization. tinyxml (currently) only supports diff --git a/rtt/marsh/tinyxmlparser.cpp b/rtt/marsh/tinyxmlparser.cpp index 73977a3c1..e4f11c58c 100644 --- a/rtt/marsh/tinyxmlparser.cpp +++ b/rtt/marsh/tinyxmlparser.cpp @@ -60,7 +60,7 @@ must not be misrepresented as being the original software. distribution. */ -#include "tinyxml.h" +#include "rtt/marsh/tinyxml.h" #include #include diff --git a/rtt/os/Atomic.hpp b/rtt/os/Atomic.hpp index ba3fcd27b..80f0588db 100644 --- a/rtt/os/Atomic.hpp +++ b/rtt/os/Atomic.hpp @@ -39,7 +39,7 @@ #ifndef OS_COMMON_ORO_ATOMIC_HPP #define OS_COMMON_ORO_ATOMIC_HPP -#include "oro_arch.h" +#include "rtt/os/oro_arch.h" namespace RTT { namespace os { diff --git a/rtt/os/CAS.hpp b/rtt/os/CAS.hpp index 7215b8b48..d3b2491bd 100644 --- a/rtt/os/CAS.hpp +++ b/rtt/os/CAS.hpp @@ -39,7 +39,7 @@ #ifndef OS_COMMON_CAS_HPP #define OS_COMMON_CAS_HPP -#include "oro_arch.h" +#include "rtt/os/oro_arch.h" namespace RTT { namespace os { diff --git a/rtt/os/Condition.hpp b/rtt/os/Condition.hpp index da21c8b4f..66f4e02b9 100644 --- a/rtt/os/Condition.hpp +++ b/rtt/os/Condition.hpp @@ -39,10 +39,10 @@ #ifndef OS_CONDITION_HPP #define OS_CONDITION_HPP -#include "fosi.h" -#include "../rtt-config.h" -#include "Time.hpp" -#include "Mutex.hpp" +#include "rtt/os/fosi.h" +#include "rtt/rtt-config.h" +#include "rtt/Time.hpp" +#include "rtt/os/Mutex.hpp" #ifdef ORO_OS_USE_BOOST_THREAD // BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG is defined in rtt-config.h #include diff --git a/rtt/os/MainThread.cpp b/rtt/os/MainThread.cpp index 9b1015e41..44ddaaff0 100644 --- a/rtt/os/MainThread.cpp +++ b/rtt/os/MainThread.cpp @@ -38,8 +38,8 @@ // this file must be included always first. -#include "os/fosi_internal_interface.hpp" -#include "os/MainThread.hpp" +#include "rtt/os/fosi_internal_interface.hpp" +#include "rtt/os/MainThread.hpp" namespace RTT { namespace os { diff --git a/rtt/os/MainThread.hpp b/rtt/os/MainThread.hpp index 25dff6e3b..bea8bc05e 100644 --- a/rtt/os/MainThread.hpp +++ b/rtt/os/MainThread.hpp @@ -40,7 +40,7 @@ #ifndef RTT_OS_MAIN_THREAD_HPP #define RTT_OS_MAIN_THREAD_HPP -#include "ThreadInterface.hpp" +#include "rtt/os/ThreadInterface.hpp" #include namespace RTT diff --git a/rtt/os/Mutex.cpp b/rtt/os/Mutex.cpp index c53fdfc76..a4036c23e 100644 --- a/rtt/os/Mutex.cpp +++ b/rtt/os/Mutex.cpp @@ -34,4 +34,4 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include +#include "rtt/os/Mutex.hpp" diff --git a/rtt/os/Mutex.hpp b/rtt/os/Mutex.hpp index 0820d481f..048baed60 100644 --- a/rtt/os/Mutex.hpp +++ b/rtt/os/Mutex.hpp @@ -39,12 +39,12 @@ #ifndef OS_MUTEX_HPP #define OS_MUTEX_HPP -#include "fosi.h" -#include "../rtt-config.h" -#include "rtt-os-fwd.hpp" -#include "CAS.hpp" -#include "Semaphore.hpp" -#include "Time.hpp" +#include "rtt/os/fosi.h" +#include "rtt/rtt-config.h" +#include "rtt/os/rtt-os-fwd.hpp" +#include "rtt/os/CAS.hpp" +#include "rtt/os/Semaphore.hpp" +#include "rtt/Time.hpp" #include diff --git a/rtt/os/MutexLock.hpp b/rtt/os/MutexLock.hpp index 18bfaf30f..5af7de0ef 100644 --- a/rtt/os/MutexLock.hpp +++ b/rtt/os/MutexLock.hpp @@ -38,9 +38,9 @@ #ifndef OS_MUTEXLOCK_HPP #define OS_MUTEXLOCK_HPP -#include "fosi.h" +#include "rtt/os/fosi.h" -#include "Mutex.hpp" +#include "rtt/os/Mutex.hpp" namespace RTT { namespace os { diff --git a/rtt/os/OS.hpp b/rtt/os/OS.hpp index 0949f663c..fe0d214ce 100644 --- a/rtt/os/OS.hpp +++ b/rtt/os/OS.hpp @@ -40,10 +40,10 @@ * This file includes commonly used headers from the Orocos OS package. */ -#include "Thread.hpp" -#include "Mutex.hpp" -#include "MutexLock.hpp" -#include "Semaphore.hpp" +#include "rtt/os/Thread.hpp" +#include "rtt/os/Mutex.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/os/Semaphore.hpp" namespace RTT { diff --git a/rtt/os/Semaphore.hpp b/rtt/os/Semaphore.hpp index 9b87e15a6..2607eee8a 100644 --- a/rtt/os/Semaphore.hpp +++ b/rtt/os/Semaphore.hpp @@ -41,9 +41,9 @@ #ifndef RTT_OS_SEMAPHORE_HPP #define RTT_OS_SEMAPHORE_HPP -#include "fosi.h" -#include "../rtt-config.h" -#include "../Time.hpp" +#include "rtt/os/fosi.h" +#include "rtt/rtt-config.h" +#include "rtt/Time.hpp" namespace RTT { namespace os { diff --git a/rtt/os/StartStopManager.cpp b/rtt/os/StartStopManager.cpp index 5c48f33a6..96c28b6eb 100644 --- a/rtt/os/StartStopManager.cpp +++ b/rtt/os/StartStopManager.cpp @@ -35,7 +35,7 @@ * * ***************************************************************************/ -#include "os/StartStopManager.hpp" +#include "rtt/os/StartStopManager.hpp" //needed for std::bind1st and std::mem_fun to compile under MSVC #include diff --git a/rtt/os/StartStopManager.hpp b/rtt/os/StartStopManager.hpp index 0195ccb8c..047791b01 100644 --- a/rtt/os/StartStopManager.hpp +++ b/rtt/os/StartStopManager.hpp @@ -39,12 +39,12 @@ #ifndef STARTSTOPMANAGER_HPP #define STARTSTOPMANAGER_HPP -#include "../Time.hpp" +#include "rtt/Time.hpp" #include #include #include #include -#include "../rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { namespace os { diff --git a/rtt/os/Thread.cpp b/rtt/os/Thread.cpp index db413d3a5..4f338f12b 100644 --- a/rtt/os/Thread.cpp +++ b/rtt/os/Thread.cpp @@ -35,24 +35,24 @@ * * ***************************************************************************/ -#include "fosi_internal_interface.hpp" -#include "Thread.hpp" -#include "../Time.hpp" -#include "threads.hpp" -#include "../Logger.hpp" -#include "MutexLock.hpp" -#include "MainThread.hpp" +#include "rtt/os/fosi_internal_interface.hpp" +#include "rtt/os/Thread.hpp" +#include "rtt/Time.hpp" +#include "rtt/os/threads.hpp" +#include "rtt/Logger.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/os/MainThread.hpp" -#include "../rtt-config.h" -#include "../internal/CatchConfig.hpp" +#include "rtt/rtt-config.h" +#include "rtt/internal/CatchConfig.hpp" #ifdef OROPKG_OS_THREAD_SCOPE -# include "../extras/dev/DigitalOutInterface.hpp" +#include "rtt/extras/dev/DigitalOutInterface.hpp" #define SCOPE_INIT(name) #define SCOPE_ON if ( task->d ) task->d->switchOn( bit ); #define SCOPE_OFF if ( task->d ) task->d->switchOff( bit ); #elif defined(HAVE_LTTNG_UST) && defined(OROPKG_OS_GNULINUX) -#include "gnulinux/traces/lttng_ust.h" +#include "rtt/os/gnulinux/traces/lttng_ust.h" #define SCOPE_INIT(name) tracepoint(orocos_rtt, thread_init , name); #define SCOPE_ON tracepoint(orocos_rtt, thread_scope, 1); #define SCOPE_OFF tracepoint(orocos_rtt, thread_scope, 0); diff --git a/rtt/os/Thread.hpp b/rtt/os/Thread.hpp index a220c40cb..9e7852492 100644 --- a/rtt/os/Thread.hpp +++ b/rtt/os/Thread.hpp @@ -39,11 +39,11 @@ #define ORO_THREAD_HPP // Our own package config headers. -#include "../rtt-config.h" -#include "fosi.h" +#include "rtt/rtt-config.h" +#include "rtt/os/fosi.h" -#include "ThreadInterface.hpp" -#include "Mutex.hpp" +#include "rtt/os/ThreadInterface.hpp" +#include "rtt/os/Mutex.hpp" #include diff --git a/rtt/os/ThreadInterface.cpp b/rtt/os/ThreadInterface.cpp index 8580a8936..578484aa7 100644 --- a/rtt/os/ThreadInterface.cpp +++ b/rtt/os/ThreadInterface.cpp @@ -36,9 +36,9 @@ ***************************************************************************/ -#include "os/ThreadInterface.hpp" -#include "os/threads.hpp" -#include "os/fosi_internal_interface.hpp" +#include "rtt/os/ThreadInterface.hpp" +#include "rtt/os/threads.hpp" +#include "rtt/os/fosi_internal_interface.hpp" using namespace RTT::os; diff --git a/rtt/os/ThreadInterface.hpp b/rtt/os/ThreadInterface.hpp index 9e0f97b0c..5ef9ee5d1 100644 --- a/rtt/os/ThreadInterface.hpp +++ b/rtt/os/ThreadInterface.hpp @@ -39,10 +39,10 @@ #ifndef OS_THREAD_INTERFACE_HPP #define OS_THREAD_INTERFACE_HPP -#include "fosi.h" -#include "threads.hpp" -#include "Time.hpp" -#include "../rtt-config.h" +#include "rtt/os/fosi.h" +#include "rtt/os/threads.hpp" +#include "rtt/Time.hpp" +#include "rtt/rtt-config.h" namespace RTT { diff --git a/rtt/os/Time.hpp b/rtt/os/Time.hpp index 88ad5390d..3915bfce6 100644 --- a/rtt/os/Time.hpp +++ b/rtt/os/Time.hpp @@ -42,7 +42,7 @@ #include //rint function support implemented for MSVC -#include "rint.h" +#include "rtt/os/rint.h" namespace RTT { diff --git a/rtt/os/TimeService.cpp b/rtt/os/TimeService.cpp index ee20dc5de..7ea2a39cc 100644 --- a/rtt/os/TimeService.cpp +++ b/rtt/os/TimeService.cpp @@ -35,8 +35,8 @@ * * ***************************************************************************/ -#include "os/fosi.h" -#include "TimeService.hpp" +#include "rtt/os/fosi.h" +#include "rtt/os/TimeService.hpp" namespace RTT { using namespace os; diff --git a/rtt/os/TimeService.hpp b/rtt/os/TimeService.hpp index 6e256f8b5..441fd4f70 100644 --- a/rtt/os/TimeService.hpp +++ b/rtt/os/TimeService.hpp @@ -39,8 +39,8 @@ #ifndef RTT_TIME_SERVICE_HPP #define RTT_TIME_SERVICE_HPP -#include "Time.hpp" -#include "../rtt-config.h" +#include "rtt/Time.hpp" +#include "rtt/rtt-config.h" namespace RTT { namespace os { diff --git a/rtt/os/Timer.cpp b/rtt/os/Timer.cpp index 5179b4592..564d9b497 100644 --- a/rtt/os/Timer.cpp +++ b/rtt/os/Timer.cpp @@ -36,11 +36,11 @@ ***************************************************************************/ -#include "Timer.hpp" -#include "MutexLock.hpp" -#include "../Activity.hpp" -#include "../Logger.hpp" -#include "../os/fosi.h" +#include "rtt/os/Timer.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/Activity.hpp" +#include "rtt/Logger.hpp" +#include "rtt/os/fosi.h" #include namespace RTT { diff --git a/rtt/os/Timer.hpp b/rtt/os/Timer.hpp index 09347890d..01c97503a 100644 --- a/rtt/os/Timer.hpp +++ b/rtt/os/Timer.hpp @@ -39,13 +39,13 @@ #ifndef ORO_RTT_TIMER_HPP #define ORO_RTT_TIMER_HPP -#include "Time.hpp" -#include "TimeService.hpp" -#include "Mutex.hpp" -#include "Semaphore.hpp" -#include "Condition.hpp" -#include "ThreadInterface.hpp" -#include "../base/RunnableInterface.hpp" +#include "rtt/Time.hpp" +#include "rtt/os/TimeService.hpp" +#include "rtt/os/Mutex.hpp" +#include "rtt/os/Semaphore.hpp" +#include "rtt/os/Condition.hpp" +#include "rtt/os/ThreadInterface.hpp" +#include "rtt/base/RunnableInterface.hpp" #include #include #include diff --git a/rtt/os/ecos/ecosthreads.cpp b/rtt/os/ecos/ecosthreads.cpp index 55d24d330..7646d5b92 100644 --- a/rtt/os/ecos/ecosthreads.cpp +++ b/rtt/os/ecos/ecosthreads.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "os_ecos.h" -#include +#include "rtt/os/ecos/os_ecos.h" +#include "rtt/os/threads.hpp" namespace RTT { namespace os { diff --git a/rtt/os/ecos/fosi.c b/rtt/os/ecos/fosi.c index 102a3976d..81e3b8b69 100644 --- a/rtt/os/ecos/fosi.c +++ b/rtt/os/ecos/fosi.c @@ -25,7 +25,7 @@ * * ***************************************************************************/ -#include +#include "rtt/os/fosi.h" #include #include diff --git a/rtt/os/ecos/fosi.h b/rtt/os/ecos/fosi.h index e000eae41..f972febf0 100644 --- a/rtt/os/ecos/fosi.h +++ b/rtt/os/ecos/fosi.h @@ -50,12 +50,12 @@ extern "C" #include #include // #include -#include "os_ecos.h" +#include "rtt/os/ecos/os_ecos.h" #include #include // for diag_printf // Own implementation of recursive mutexes -#include "ecos_rec_mutex.h" +#include "rtt/os/ecos/ecos_rec_mutex.h" #define SCHED_ECOS_FIFO 0 /** eCos Scheduler */ #define ORO_SCHED_RT 0 diff --git a/rtt/os/ecos/fosi_internal.cpp b/rtt/os/ecos/fosi_internal.cpp index 3d17a2cfa..79ccf5665 100644 --- a/rtt/os/ecos/fosi_internal.cpp +++ b/rtt/os/ecos/fosi_internal.cpp @@ -28,9 +28,9 @@ #include #include -#include "ThreadInterface.hpp" -#include "fosi.h" -#include "../fosi_internal_interface.hpp" +#include "rtt/os/ThreadInterface.hpp" +#include "rtt/os/fosi.h" +#include "rtt/os/fosi_internal_interface.hpp" #include #include #include diff --git a/rtt/os/exceptions.cpp b/rtt/os/exceptions.cpp index 6a3d59516..bd9bd6466 100644 --- a/rtt/os/exceptions.cpp +++ b/rtt/os/exceptions.cpp @@ -37,13 +37,13 @@ -#include "../rtt-config.h" +#include "rtt/rtt-config.h" #include #include #ifdef OROPKG_CORELIB_LOGGER -#include +#include "rtt/Logger.hpp" #endif #ifdef OROBLD_OS_NOEXCEPTIONS diff --git a/rtt/os/fosi.h b/rtt/os/fosi.h index a8abeddeb..2b7cedf67 100644 --- a/rtt/os/fosi.h +++ b/rtt/os/fosi.h @@ -1,12 +1,12 @@ /*************************************************************************** - tag: FMTC Tue Mar 11 21:49:19 CET 2008 fosi.h + tag: FMTC Tue Mar 11 21:49:19 CET 2008 fosi.h fosi.h - description ------------------- begin : Tue March 11 2008 copyright : (C) 2008 FMTC email : peter.soetens@fmtc.be - + *************************************************************************** * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public * @@ -34,31 +34,31 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ - - -#include "../rtt-config.h" + + +#include "rtt/rtt-config.h" #ifdef OROPKG_OS_GNULINUX - #include "gnulinux/fosi.h" + #include "rtt/os/gnulinux/fosi.h" #endif #ifdef OROPKG_OS_LXRT - #include "lxrt/fosi.h" + #include "rtt/os/lxrt/fosi.h" #endif #ifdef OROPKG_OS_XENOMAI - #include "xenomai/fosi.h" + #include "rtt/os/xenomai/fosi.h" #endif #ifdef OROPKG_OS_ECOS - #include "ecos/fosi.h" + #include "rtt/os/ecos/fosi.h" #endif #ifdef OROPKG_OS_MACOSX - #include "macosx/fosi.h" + #include "rtt/os/macosx/fosi.h" #endif #ifdef OROPKG_OS_WIN32 - #include "win32/fosi.h" + #include "rtt/os/win32/fosi.h" #endif diff --git a/rtt/os/fosi_interface.h b/rtt/os/fosi_interface.h index 65049bf1e..bbf7aeda6 100644 --- a/rtt/os/fosi_interface.h +++ b/rtt/os/fosi_interface.h @@ -59,7 +59,7 @@ extern "C" // include 'atomic' functions, // depends on processor target, not OS. -#include "oro_arch.h" +#include "rtt/os/oro_arch.h" #define ORO_SCHED_RT 0 /** Hard real-time scheduler type. @see RTT::OS::ThreadInterface::setScheduler */ #define ORO_SCHED_OTHER 1 /** Soft real-time scheduler type. @see RTT::OS::ThreadInterface::setScheduler */ diff --git a/rtt/os/fosi_internal_interface.hpp b/rtt/os/fosi_internal_interface.hpp index 80ff93d4a..7baf12ba6 100644 --- a/rtt/os/fosi_internal_interface.hpp +++ b/rtt/os/fosi_internal_interface.hpp @@ -47,8 +47,8 @@ #ifndef OS_FOSI_INTERNAL_INTERFACE_HPP #define OS_FOSI_INTERNAL_INTERFACE_HPP -#include "ThreadInterface.hpp" -#include "fosi.h" +#include "rtt/os/ThreadInterface.hpp" +#include "rtt/os/fosi.h" namespace RTT { namespace os { diff --git a/rtt/os/gnulinux/fosi.c b/rtt/os/gnulinux/fosi.c index 118885394..e50c71926 100644 --- a/rtt/os/gnulinux/fosi.c +++ b/rtt/os/gnulinux/fosi.c @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "fosi.h" +#include "rtt/os/fosi.h" diff --git a/rtt/os/gnulinux/fosi.h b/rtt/os/gnulinux/fosi.h index 5f2d3b1e2..447cf7a6a 100644 --- a/rtt/os/gnulinux/fosi.h +++ b/rtt/os/gnulinux/fosi.h @@ -65,7 +65,7 @@ extern "C" #include #include #include -#include "../oro_limits.h" +#include "rtt/os/oro_limits.h" // Time Related #include diff --git a/rtt/os/gnulinux/fosi_internal.cpp b/rtt/os/gnulinux/fosi_internal.cpp index d630e1b23..03a620dab 100644 --- a/rtt/os/gnulinux/fosi_internal.cpp +++ b/rtt/os/gnulinux/fosi_internal.cpp @@ -35,10 +35,10 @@ * * ***************************************************************************/ -#include "../ThreadInterface.hpp" -#include "fosi.h" -#include "../fosi_internal_interface.hpp" -#include "../../Logger.hpp" +#include "rtt/os/ThreadInterface.hpp" +#include "rtt/os/fosi.h" +#include "rtt/os/fosi_internal_interface.hpp" +#include "rtt/Logger.hpp" #include #include #include diff --git a/rtt/os/gnulinux/gnuthreads.cpp b/rtt/os/gnulinux/gnuthreads.cpp index f2d21d744..b7afe6899 100644 --- a/rtt/os/gnulinux/gnuthreads.cpp +++ b/rtt/os/gnulinux/gnuthreads.cpp @@ -37,7 +37,7 @@ -#include +#include "rtt/os/threads.hpp" namespace RTT { namespace os { diff --git a/rtt/os/gnulinux/traces/lttng_ust.c b/rtt/os/gnulinux/traces/lttng_ust.c index ca035c002..e43e9ca7d 100644 --- a/rtt/os/gnulinux/traces/lttng_ust.c +++ b/rtt/os/gnulinux/traces/lttng_ust.c @@ -1,3 +1,3 @@ #define TRACEPOINT_CREATE_PROBES -#include "lttng_ust.h" +#include "rtt/os/gnulinux/traces/lttng_ust.h" diff --git a/rtt/os/lxrt/fosi.c b/rtt/os/lxrt/fosi.c index c5a8a999a..bde03033b 100644 --- a/rtt/os/lxrt/fosi.c +++ b/rtt/os/lxrt/fosi.c @@ -37,7 +37,7 @@ #define OROBLD_OS_LXRT_INTERNAL -#include "os/fosi.h" +#include "rtt/os/fosi.h" #ifdef OROBLD_OS_AGNOSTIC // Encapsulate all RTAI/LXRT specific functions diff --git a/rtt/os/lxrt/fosi.h b/rtt/os/lxrt/fosi.h index 36c34b072..fb51635e7 100644 --- a/rtt/os/lxrt/fosi.h +++ b/rtt/os/lxrt/fosi.h @@ -64,13 +64,13 @@ #include #include #include -#include "../oro_limits.h" +#include "rtt/os/oro_limits.h" #ifdef __cplusplus extern "C" { #endif -#include "../../rtt-config.h" +#include "rtt/rtt-config.h" #if !defined(OROBLD_OS_AGNOSTIC) || defined(OROBLD_OS_LXRT_INTERNAL) // define the latter to include nevertheless the RTAI header files // force inlining if internal and internal to avoid an extra indirection. diff --git a/rtt/os/lxrt/fosi_internal.cpp b/rtt/os/lxrt/fosi_internal.cpp index c109a549e..b0142cb1d 100644 --- a/rtt/os/lxrt/fosi_internal.cpp +++ b/rtt/os/lxrt/fosi_internal.cpp @@ -42,18 +42,18 @@ #include #include -#include "os/ThreadInterface.hpp" -#include "fosi.h" -#include "../fosi_internal_interface.hpp" +#include "rtt/os/ThreadInterface.hpp" +#include "rtt/os/fosi.h" +#include "rtt/os/fosi_internal_interface.hpp" #include #include #include -#include "../../rtt-config.h" +#include "rtt/rtt-config.h" #define INTERNAL_QUAL #include -#include "../../Logger.hpp" +#include "rtt/Logger.hpp" namespace RTT { diff --git a/rtt/os/lxrt/lxrtthreads.cpp b/rtt/os/lxrt/lxrtthreads.cpp index fff85b2f0..5d8864ba2 100644 --- a/rtt/os/lxrt/lxrtthreads.cpp +++ b/rtt/os/lxrt/lxrtthreads.cpp @@ -37,7 +37,7 @@ -#include +#include "rtt/os/threads.hpp" namespace RTT { namespace os { diff --git a/rtt/os/macosx/fosi.c b/rtt/os/macosx/fosi.c index c0c130087..c36efb876 100644 --- a/rtt/os/macosx/fosi.c +++ b/rtt/os/macosx/fosi.c @@ -31,4 +31,4 @@ ***************************************************************************/ -#include "fosi.h" +#include "rtt/os/fosi.h" diff --git a/rtt/os/macosx/fosi_internal.cpp b/rtt/os/macosx/fosi_internal.cpp index 05b0078ce..313cf6931 100644 --- a/rtt/os/macosx/fosi_internal.cpp +++ b/rtt/os/macosx/fosi_internal.cpp @@ -31,12 +31,12 @@ ***************************************************************************/ -#include "../ThreadInterface.hpp" -#include "fosi.h" -#include "../fosi_internal_interface.hpp" -#include "../../Logger.hpp" +#include "rtt/os/ThreadInterface.hpp" +#include "rtt/os/fosi.h" +#include "rtt/os/fosi_internal_interface.hpp" +#include "rtt/Logger.hpp" #include -#include "../Mutex.hpp" +#include "rtt/os/Mutex.hpp" #define INTERNAL_QUAL diff --git a/rtt/os/macosx/gnuthreads.cpp b/rtt/os/macosx/gnuthreads.cpp index b7a24ef95..f2a15bc77 100644 --- a/rtt/os/macosx/gnuthreads.cpp +++ b/rtt/os/macosx/gnuthreads.cpp @@ -32,7 +32,7 @@ -#include +#include "rtt/os/threads.hpp" /* See the darwin kernel programming guide e.g diff --git a/rtt/os/main.h b/rtt/os/main.h index 55d34c297..403ce91e9 100644 --- a/rtt/os/main.h +++ b/rtt/os/main.h @@ -43,8 +43,8 @@ * */ -#include "startstop.h" -#include "../Logger.hpp" +#include "rtt/os/startstop.h" +#include "rtt/Logger.hpp" /** * Forward declare this wrapper around the user code. diff --git a/rtt/os/oro_allocator.hpp b/rtt/os/oro_allocator.hpp index 60cf9c904..bebad22b6 100644 --- a/rtt/os/oro_allocator.hpp +++ b/rtt/os/oro_allocator.hpp @@ -43,8 +43,8 @@ #include #include -#include "MutexLock.hpp" -#include "oro_malloc.h" +#include "rtt/os/MutexLock.hpp" +#include "rtt/os/oro_malloc.h" namespace RTT { namespace os { /** diff --git a/rtt/os/oro_arch.h b/rtt/os/oro_arch.h index 7c02ae794..93ca8277b 100644 --- a/rtt/os/oro_arch.h +++ b/rtt/os/oro_arch.h @@ -37,26 +37,26 @@ ***************************************************************************/ -#include "../rtt-config.h" +#include "rtt/rtt-config.h" # if defined(OROBLD_OS_NO_ASM) -# include "oro_noasm/oro_arch.h" +#include "rtt/os/oro_noasm/oro_arch.h" # else # if defined(_MSC_VER) -# include "oro_msvc/oro_arch.h" +#include "rtt/os/oro_msvc/oro_arch.h" # elif defined(__GNUC__) # if ( OROBLD_GCC_VERSION < 40100 || defined(__clang__) ) # if defined( OROBLD_OS_ARCH_i386 ) -# include "oro_i386/oro_arch.h" +#include "rtt/os/oro_i386/oro_arch.h" # elif defined( OROBLD_OS_ARCH_x86_64 ) -# include "oro_x86_64/oro_arch.h" +#include "rtt/os/oro_x86_64/oro_arch.h" # elif defined( OROBLD_OS_ARCH_ppc ) -# include "oro_powerpc/oro_arch.h" +#include "rtt/os/oro_powerpc/oro_arch.h" # else # error "Unsupported architecture for GCC < 4.1.0 or clang++" # endif # else // GCC >= 4.1.0 has intrinsics. Clang++'s 2.9 intrinsics are broken in C++ code -# include "oro_gcc/oro_arch.h" +#include "rtt/os/oro_gcc/oro_arch.h" # endif # else # error "Unsupported architecture or compiler" diff --git a/rtt/os/oro_gcc/oro_arch.h b/rtt/os/oro_gcc/oro_arch.h index f0952632d..9ae843093 100644 --- a/rtt/os/oro_gcc/oro_arch.h +++ b/rtt/os/oro_gcc/oro_arch.h @@ -40,7 +40,7 @@ #ifndef __GCC_ORO_ARCH__ #define __GCC_ORO_ARCH__ -#include "../../rtt-config.h" +#include "rtt/rtt-config.h" /** * Structure that contains an int for atomic diff --git a/rtt/os/oro_i386/oro_arch.h b/rtt/os/oro_i386/oro_arch.h index de3d13a19..2dce0cd70 100644 --- a/rtt/os/oro_i386/oro_arch.h +++ b/rtt/os/oro_i386/oro_arch.h @@ -37,7 +37,7 @@ -#include "../../rtt-config.h" +#include "rtt/rtt-config.h" #ifndef __ORO_ARCH_I386__ #define __ORO_ARCH_I386__ diff --git a/rtt/os/oro_malloc.h b/rtt/os/oro_malloc.h index dd00347f5..4f98788d0 100644 --- a/rtt/os/oro_malloc.h +++ b/rtt/os/oro_malloc.h @@ -45,9 +45,9 @@ #define _ORO_MALLOC_H_ -#include "../rtt-config.h" +#include "rtt/rtt-config.h" #ifdef OS_RT_MALLOC -#include "tlsf/tlsf.h" +#include "rtt/os/tlsf/tlsf.h" #else #include diff --git a/rtt/os/oro_msvc/oro_arch.h b/rtt/os/oro_msvc/oro_arch.h index b66750a08..0fd6c6aba 100644 --- a/rtt/os/oro_msvc/oro_arch.h +++ b/rtt/os/oro_msvc/oro_arch.h @@ -37,7 +37,7 @@ ***************************************************************************/ -#include "../../rtt-config.h" +#include "rtt/rtt-config.h" #ifndef __ARCH_MSVC_ORO_ATOMIC__ #define __ARCH_MSVC_ORO_ATOMIC__ diff --git a/rtt/os/oro_noasm/oro_arch.h b/rtt/os/oro_noasm/oro_arch.h index cde4164de..77b63c2e7 100644 --- a/rtt/os/oro_noasm/oro_arch.h +++ b/rtt/os/oro_noasm/oro_arch.h @@ -45,8 +45,8 @@ * resource counting etc. We emulate it using mutexes. */ -#include "../../rtt-config.h" -#include "../fosi.h" +#include "rtt/rtt-config.h" +#include "rtt/os/fosi.h" #ifndef __GNUC__ #define __inline__ diff --git a/rtt/os/oro_powerpc/oro_arch.h b/rtt/os/oro_powerpc/oro_arch.h index 7da5971e5..8a88a4845 100644 --- a/rtt/os/oro_powerpc/oro_arch.h +++ b/rtt/os/oro_powerpc/oro_arch.h @@ -41,7 +41,7 @@ #ifndef __ORO_ARCH_POWERPC__ #define __ORO_ARCH_POWERPC__ -#include "oro_atomic.h" -#include "oro_system.h" +#include "rtt/os/oro_powerpc/oro_atomic.h" +#include "rtt/os/oro_powerpc/oro_system.h" #endif /* __ORO_ARCH_POWERPC__ */ diff --git a/rtt/os/oro_powerpc/oro_system.h b/rtt/os/oro_powerpc/oro_system.h index 916164ea2..923c2ef79 100644 --- a/rtt/os/oro_powerpc/oro_system.h +++ b/rtt/os/oro_powerpc/oro_system.h @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "oro_atomic.h" +#include "rtt/os/oro_powerpc/oro_atomic.h" #ifdef _cplusplus extern "C" diff --git a/rtt/os/oro_x86_64/oro_arch.h b/rtt/os/oro_x86_64/oro_arch.h index 25125fed8..4d370bc00 100644 --- a/rtt/os/oro_x86_64/oro_arch.h +++ b/rtt/os/oro_x86_64/oro_arch.h @@ -37,7 +37,7 @@ -#include "../../rtt-config.h" +#include "rtt/rtt-config.h" #ifndef __ORO_ARCH_x86_64__ #define __ORO_ARCH_x86_64__ diff --git a/rtt/os/rint.cpp b/rtt/os/rint.cpp index 3b62d7937..a2488f02f 100644 --- a/rtt/os/rint.cpp +++ b/rtt/os/rint.cpp @@ -43,7 +43,7 @@ * Author: David Yu * * * ****************************************/ -#include "os/rint.h" +#include "rtt/os/rint.h" #include #ifdef _MSC_VER diff --git a/rtt/os/rint.h b/rtt/os/rint.h index 53cc73e0b..b9f7845f7 100644 --- a/rtt/os/rint.h +++ b/rtt/os/rint.h @@ -45,6 +45,6 @@ ****************************************/ #ifdef _MSC_VER -#include "../rtt-config.h" +#include "rtt/rtt-config.h" RTT_API double rint( double value ); #endif diff --git a/rtt/os/rt_list.hpp b/rtt/os/rt_list.hpp index 10096d218..290f50511 100644 --- a/rtt/os/rt_list.hpp +++ b/rtt/os/rt_list.hpp @@ -40,7 +40,7 @@ #define ORO_OS_RT_LIST_HPP #include -#include "oro_allocator.hpp" +#include "rtt/os/oro_allocator.hpp" namespace RTT { namespace os { diff --git a/rtt/os/rtconversions.cpp b/rtt/os/rtconversions.cpp index 7c3f7ac95..1c839ec41 100644 --- a/rtt/os/rtconversions.cpp +++ b/rtt/os/rtconversions.cpp @@ -35,7 +35,7 @@ * * ***************************************************************************/ -#include "os/rtconversions.hpp" +#include "rtt/os/rtconversions.hpp" #include #include diff --git a/rtt/os/rtstreambufs.hpp b/rtt/os/rtstreambufs.hpp index 75b0b0d70..557afcdc5 100644 --- a/rtt/os/rtstreambufs.hpp +++ b/rtt/os/rtstreambufs.hpp @@ -39,7 +39,7 @@ #define RTSTREAMBUFS_HPP #include -#include "fosi.h" +#include "rtt/os/fosi.h" namespace RTT {namespace os diff --git a/rtt/os/rtstreams.cpp b/rtt/os/rtstreams.cpp index 06eb5c3b0..c32262852 100644 --- a/rtt/os/rtstreams.cpp +++ b/rtt/os/rtstreams.cpp @@ -34,8 +34,8 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "os/rtstreams.hpp" -#include "os/fosi.h" +#include "rtt/os/rtstreams.hpp" +#include "rtt/os/fosi.h" #include namespace RTT diff --git a/rtt/os/rtstreams.hpp b/rtt/os/rtstreams.hpp index 5d215e9cb..ce4e884e4 100644 --- a/rtt/os/rtstreams.hpp +++ b/rtt/os/rtstreams.hpp @@ -35,10 +35,10 @@ * * ***************************************************************************/ -#include "fosi.h" +#include "rtt/os/fosi.h" -#include "rtconversions.hpp" -#include "rtstreambufs.hpp" +#include "rtt/os/rtconversions.hpp" +#include "rtt/os/rtstreambufs.hpp" #ifndef RTSTREAMS_HPP #define RTSTREAMS_HPP diff --git a/rtt/os/startstop.cpp b/rtt/os/startstop.cpp index db401ce0a..95180efd8 100644 --- a/rtt/os/startstop.cpp +++ b/rtt/os/startstop.cpp @@ -42,22 +42,22 @@ * The target calls these functions at startup time. */ -#include "../rtt-config.h" -#include -#include "os/MainThread.hpp" -#include "os/StartStopManager.hpp" -#include "../internal/GlobalEngine.hpp" -#include "../types/GlobalsRepository.hpp" -#include "../types/TypekitRepository.hpp" +#include "rtt/rtt-config.h" +#include "rtt/os/startstop.h" +#include "rtt/os/MainThread.hpp" +#include "rtt/os/StartStopManager.hpp" +#include "rtt/internal/GlobalEngine.hpp" +#include "rtt/types/GlobalsRepository.hpp" +#include "rtt/types/TypekitRepository.hpp" #ifdef OROPKG_OS_THREAD_SCOPE # include -# include "../extras/dev/DigitalOutInterface.hpp" +#include "rtt/extras/dev/DigitalOutInterface.hpp" using namespace RTT; #elif defined(HAVE_LTTNG_UST) && defined(OROPKG_OS_GNULINUX) #define TRACEPOINT_DEFINE #define TRACEPOINT_PROBE_DYNAMIC_LINKAGE -#include "gnulinux/traces/lttng_ust.h" +#include "rtt/os/gnulinux/traces/lttng_ust.h" #endif #ifdef OS_HAVE_IOSTREAM @@ -67,8 +67,8 @@ using namespace std; #include #endif -#include "../Logger.hpp" -#include "TimeService.hpp" +#include "rtt/Logger.hpp" +#include "rtt/os/TimeService.hpp" using namespace RTT; using namespace RTT::os; diff --git a/rtt/os/startstop.h b/rtt/os/startstop.h index 77eb45496..03bee4c05 100644 --- a/rtt/os/startstop.h +++ b/rtt/os/startstop.h @@ -42,7 +42,7 @@ * Prototype definitions of common os init/exit calls. */ -#include "../rtt-config.h" +#include "rtt/rtt-config.h" #include /** diff --git a/rtt/os/targets/rtt-target.h.in b/rtt/os/targets/rtt-target.h.in index 59c7b4b16..eb91e1d47 100644 --- a/rtt/os/targets/rtt-target.h.in +++ b/rtt/os/targets/rtt-target.h.in @@ -41,8 +41,8 @@ * It includes the correct target, on behalf of rtt-config.h */ -#define ORO_RTT_CONFIG_str(s) ORO_RTT_CONFIG__str(s-config.h) -#define ORO_RTT_CONFIG_OS_str(s) ORO_RTT_CONFIG__str(../s/s.h) +#define ORO_RTT_CONFIG_str(s) ORO_RTT_CONFIG__str(rtt/os/targets/s-config.h) +#define ORO_RTT_CONFIG_OS_str(s) ORO_RTT_CONFIG__str(rtt/os/s/s.h) #define ORO_RTT_CONFIG__str(s) #s #define OROCOS_TARGET_HEADER ORO_RTT_CONFIG_str(OROCOS_TARGET) diff --git a/rtt/os/threads.cpp b/rtt/os/threads.cpp index 82a378fac..06a207fba 100644 --- a/rtt/os/threads.cpp +++ b/rtt/os/threads.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "os/threads.hpp" -#include "os/fosi_internal_interface.hpp" +#include "rtt/os/threads.hpp" +#include "rtt/os/fosi_internal_interface.hpp" namespace RTT { namespace os { diff --git a/rtt/os/threads.hpp b/rtt/os/threads.hpp index 6bc2e2759..55d6b814d 100644 --- a/rtt/os/threads.hpp +++ b/rtt/os/threads.hpp @@ -39,8 +39,8 @@ #ifndef OS_THREADS_HPP #define OS_THREADS_HPP -#include "Atomic.hpp" -#include "../rtt-config.h" +#include "rtt/os/Atomic.hpp" +#include "rtt/rtt-config.h" namespace RTT { namespace os { diff --git a/rtt/os/tlsf/target.h b/rtt/os/tlsf/target.h index 782f704b7..af7327659 100644 --- a/rtt/os/tlsf/target.h +++ b/rtt/os/tlsf/target.h @@ -39,7 +39,7 @@ #ifndef _TLSF_TARGET_H_ #define _TLSF_TARGET_H_ -#include "../fosi.h" +#include "rtt/os/fosi.h" #define TLSF_MLOCK_T rt_mutex_t #define TLSF_CREATE_LOCK(l) rtos_mutex_init (l) diff --git a/rtt/os/tlsf/tlsf.c b/rtt/os/tlsf/tlsf.c index 37b3e72e8..81b235362 100644 --- a/rtt/os/tlsf/tlsf.c +++ b/rtt/os/tlsf/tlsf.c @@ -57,7 +57,7 @@ #ifdef __APPLE__ #define _DARWIN_C_SOURCE #else -#include "../fosi.h" +#include "rtt/os/fosi.h" #endif #include @@ -78,7 +78,7 @@ #if TLSF_USE_LOCKS -#include "target.h" +#include "rtt/os/tlsf/target.h" #else #define TLSF_CREATE_LOCK(_unused_) do{}while(0) #define TLSF_DESTROY_LOCK(_unused_) do{}while(0) @@ -116,7 +116,7 @@ #endif #define ORO_MEMORY_POOL -#include "tlsf.h" +#include "rtt/os/tlsf/tlsf.h" #if !defined(__GNUC__) #ifndef __inline__ diff --git a/rtt/os/tlsf/tlsf.h b/rtt/os/tlsf/tlsf.h index a31f2320b..4d002fb72 100644 --- a/rtt/os/tlsf/tlsf.h +++ b/rtt/os/tlsf/tlsf.h @@ -22,7 +22,7 @@ /* We avoid name clashes with other projects and * only make the required function available */ -#include "../fosi.h" +#include "rtt/os/fosi.h" #define tlsf_malloc oro_rt_malloc #define tlsf_free oro_rt_free #define tlsf_realloc oro_rt_realloc diff --git a/rtt/os/traces.h b/rtt/os/traces.h index 812c56baf..0ba69dfe7 100644 --- a/rtt/os/traces.h +++ b/rtt/os/traces.h @@ -1,10 +1,10 @@ #ifndef RTT_OS_TRACES_H #define RTT_OS_TRACES_H -#include "../rtt-config.h" +#include "rtt/rtt-config.h" #if defined(HAVE_LTTNG_UST) && defined(OROPKG_OS_GNULINUX) -#include +#include "rtt/os/gnulinux/traces/lttng_ust.h" #else #define tracepoint(provider, tracepoint, ...) #define tracepoint_context(provider, tracepoint, ...) diff --git a/rtt/os/win32/dlfcn.c b/rtt/os/win32/dlfcn.c index 4e531fe75..ccaa9276c 100644 --- a/rtt/os/win32/dlfcn.c +++ b/rtt/os/win32/dlfcn.c @@ -1,314 +1,314 @@ -/* - * dlfcn-win32 - * Copyright (c) 2007 Ramiro Polla - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "dlfcn.h" -#include -#include - -/* Note: - * MSDN says these functions are not thread-safe. We make no efforts to have - * any kind of thread safety. - */ - -typedef struct global_object { - HMODULE hModule; - struct global_object *previous; - struct global_object *next; -} global_object; - -static global_object first_object; - -/* These functions implement a double linked list for the global objects. */ -static global_object *global_search( HMODULE hModule ) -{ - global_object *pobject; - - if( hModule == NULL ) - return NULL; - - for( pobject = &first_object; pobject ; pobject = pobject->next ) - if( pobject->hModule == hModule ) - return pobject; - - return NULL; -} - -static void global_add( HMODULE hModule ) -{ - global_object *pobject; - global_object *nobject; - - if( hModule == NULL ) - return; - - pobject = global_search( hModule ); - - /* Do not add object again if it's already on the list */ - if( pobject ) - return; - - for( pobject = &first_object; pobject->next ; pobject = pobject->next ); - - nobject = malloc( sizeof(global_object) ); - - /* Should this be enough to fail global_add, and therefore also fail - * dlopen? - */ - if( !nobject ) - return; - - pobject->next = nobject; - nobject->next = NULL; - nobject->previous = pobject; - nobject->hModule = hModule; -} - -static void global_rem( HMODULE hModule ) -{ - global_object *pobject; - - if( hModule == NULL ) - return; - - pobject = global_search( hModule ); - - if( !pobject ) - return; - - if( pobject->next ) - pobject->next->previous = pobject->previous; - if( pobject->previous ) - pobject->previous->next = pobject->next; - - free( pobject ); -} - -/* POSIX says dlerror( ) doesn't have to be thread-safe, so we use one - * static buffer. - * MSDN says the buffer cannot be larger than 64K bytes, so we set it to - * the limit. - */ -static char error_buffer[65535]; -static char *current_error; - -static int copy_string( char *dest, int dest_size, const char *src ) -{ - int i = 0; - - /* gcc should optimize this out */ - if( !src && !dest ) - return 0; - - for( i = 0 ; i < dest_size-1 ; i++ ) - { - if( !src[i] ) - break; - else - dest[i] = src[i]; - } - dest[i] = '\0'; - - return i; -} - -static void save_err_str( const char *str ) -{ - DWORD dwMessageId; - DWORD pos; - - dwMessageId = GetLastError( ); - - if( dwMessageId == 0 ) - return; - - /* Format error message to: - * "": - */ - pos = copy_string( error_buffer, sizeof(error_buffer), "\"" ); - pos += copy_string( error_buffer+pos, sizeof(error_buffer)-pos, str ); - pos += copy_string( error_buffer+pos, sizeof(error_buffer)-pos, "\": " ); - pos += FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwMessageId, - MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ), - error_buffer+pos, sizeof(error_buffer)-pos, NULL ); - - if( pos > 1 ) - { - /* POSIX says the string must not have trailing */ - if( error_buffer[pos-2] == '\r' && error_buffer[pos-1] == '\n' ) - error_buffer[pos-2] = '\0'; - } - - current_error = error_buffer; -} - -static void save_err_ptr_str( const void *ptr ) -{ - char ptr_buf[19]; /* 0x up to 64 bits. */ - - sprintf( ptr_buf, "0x%p", ptr ); - - save_err_str( ptr_buf ); -} - -void *dlopen( const char *file, int mode ) -{ - HMODULE hModule; - UINT uMode; - - current_error = NULL; - - /* Do not let Windows display the critical-error-handler message box */ - uMode = SetErrorMode( SEM_FAILCRITICALERRORS ); - - if( file == 0 ) - { - /* POSIX says that if the value of file is 0, a handle on a global - * symbol object must be provided. That object must be able to access - * all symbols from the original program file, and any objects loaded - * with the RTLD_GLOBAL flag. - * The return value from GetModuleHandle( ) allows us to retrieve - * symbols only from the original program file. For objects loaded with - * the RTLD_GLOBAL flag, we create our own list later on. - */ - hModule = GetModuleHandle( NULL ); - - if( !hModule ) - save_err_ptr_str( file ); - } - else - { - char lpFileName[MAX_PATH]; - int i; - - /* MSDN says backslashes *must* be used instead of forward slashes. */ - for( i = 0 ; i < sizeof(lpFileName)-1 ; i++ ) - { - if( !file[i] ) - break; - else if( file[i] == '/' ) - lpFileName[i] = '\\'; - else - lpFileName[i] = file[i]; - } - lpFileName[i] = '\0'; - - /* POSIX says the search path is implementation-defined. - * LOAD_WITH_ALTERED_SEARCH_PATH is used to make it behave more closely - * to UNIX's search paths (start with system folders instead of current - * folder). - */ - hModule = LoadLibraryEx( (LPSTR) lpFileName, NULL, - LOAD_WITH_ALTERED_SEARCH_PATH ); - - /* If the object was loaded with RTLD_GLOBAL, add it to list of global - * objects, so that its symbols may be retrieved even if the handle for - * the original program file is passed. POSIX says that if the same - * file is specified in multiple invocations, and any of them are - * RTLD_GLOBAL, even if any further invocations use RTLD_LOCAL, the - * symbols will remain global. - */ - if( !hModule ) - save_err_str( lpFileName ); - else if( (mode & RTLD_GLOBAL) ) - global_add( hModule ); - } - - /* Return to previous state of the error-mode bit flags. */ - SetErrorMode( uMode ); - - return (void *) hModule; -} - -int dlclose( void *handle ) -{ - HMODULE hModule = (HMODULE) handle; - BOOL ret; - - current_error = NULL; - - ret = FreeLibrary( hModule ); - - /* If the object was loaded with RTLD_GLOBAL, remove it from list of global - * objects. - */ - if( ret ) - global_rem( hModule ); - else - save_err_ptr_str( handle ); - - /* dlclose's return value in inverted in relation to FreeLibrary's. */ - ret = !ret; - - return (int) ret; -} - -void *dlsym( void *handle, const char *name ) -{ - FARPROC symbol; - - current_error = NULL; - - symbol = GetProcAddress( handle, name ); - - if( symbol == NULL ) - { - HMODULE hModule; - - /* If the handle for the original program file is passed, also search - * in all globally loaded objects. - */ - - hModule = GetModuleHandle( NULL ); - - if( hModule == handle ) - { - global_object *pobject; - - for( pobject = &first_object; pobject ; pobject = pobject->next ) - { - if( pobject->hModule ) - { - symbol = GetProcAddress( pobject->hModule, name ); - if( symbol != NULL ) - break; - } - } - } - /* We don't need to close hModule since GetModuleHandle() - * Does not increment the refcount. - */ - } - - if( symbol == NULL ) - save_err_str( name ); - - return (void*) symbol; -} - -char *dlerror( void ) -{ - char *error_pointer = current_error; - - /* POSIX says that invoking dlerror( ) a second time, immediately following - * a prior invocation, shall result in NULL being returned. - */ - current_error = NULL; - - return error_pointer; -} +/* + * dlfcn-win32 + * Copyright (c) 2007 Ramiro Polla + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "rtt/os/win32/dlfcn.h" +#include +#include + +/* Note: + * MSDN says these functions are not thread-safe. We make no efforts to have + * any kind of thread safety. + */ + +typedef struct global_object { + HMODULE hModule; + struct global_object *previous; + struct global_object *next; +} global_object; + +static global_object first_object; + +/* These functions implement a double linked list for the global objects. */ +static global_object *global_search( HMODULE hModule ) +{ + global_object *pobject; + + if( hModule == NULL ) + return NULL; + + for( pobject = &first_object; pobject ; pobject = pobject->next ) + if( pobject->hModule == hModule ) + return pobject; + + return NULL; +} + +static void global_add( HMODULE hModule ) +{ + global_object *pobject; + global_object *nobject; + + if( hModule == NULL ) + return; + + pobject = global_search( hModule ); + + /* Do not add object again if it's already on the list */ + if( pobject ) + return; + + for( pobject = &first_object; pobject->next ; pobject = pobject->next ); + + nobject = malloc( sizeof(global_object) ); + + /* Should this be enough to fail global_add, and therefore also fail + * dlopen? + */ + if( !nobject ) + return; + + pobject->next = nobject; + nobject->next = NULL; + nobject->previous = pobject; + nobject->hModule = hModule; +} + +static void global_rem( HMODULE hModule ) +{ + global_object *pobject; + + if( hModule == NULL ) + return; + + pobject = global_search( hModule ); + + if( !pobject ) + return; + + if( pobject->next ) + pobject->next->previous = pobject->previous; + if( pobject->previous ) + pobject->previous->next = pobject->next; + + free( pobject ); +} + +/* POSIX says dlerror( ) doesn't have to be thread-safe, so we use one + * static buffer. + * MSDN says the buffer cannot be larger than 64K bytes, so we set it to + * the limit. + */ +static char error_buffer[65535]; +static char *current_error; + +static int copy_string( char *dest, int dest_size, const char *src ) +{ + int i = 0; + + /* gcc should optimize this out */ + if( !src && !dest ) + return 0; + + for( i = 0 ; i < dest_size-1 ; i++ ) + { + if( !src[i] ) + break; + else + dest[i] = src[i]; + } + dest[i] = '\0'; + + return i; +} + +static void save_err_str( const char *str ) +{ + DWORD dwMessageId; + DWORD pos; + + dwMessageId = GetLastError( ); + + if( dwMessageId == 0 ) + return; + + /* Format error message to: + * "": + */ + pos = copy_string( error_buffer, sizeof(error_buffer), "\"" ); + pos += copy_string( error_buffer+pos, sizeof(error_buffer)-pos, str ); + pos += copy_string( error_buffer+pos, sizeof(error_buffer)-pos, "\": " ); + pos += FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwMessageId, + MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ), + error_buffer+pos, sizeof(error_buffer)-pos, NULL ); + + if( pos > 1 ) + { + /* POSIX says the string must not have trailing */ + if( error_buffer[pos-2] == '\r' && error_buffer[pos-1] == '\n' ) + error_buffer[pos-2] = '\0'; + } + + current_error = error_buffer; +} + +static void save_err_ptr_str( const void *ptr ) +{ + char ptr_buf[19]; /* 0x up to 64 bits. */ + + sprintf( ptr_buf, "0x%p", ptr ); + + save_err_str( ptr_buf ); +} + +void *dlopen( const char *file, int mode ) +{ + HMODULE hModule; + UINT uMode; + + current_error = NULL; + + /* Do not let Windows display the critical-error-handler message box */ + uMode = SetErrorMode( SEM_FAILCRITICALERRORS ); + + if( file == 0 ) + { + /* POSIX says that if the value of file is 0, a handle on a global + * symbol object must be provided. That object must be able to access + * all symbols from the original program file, and any objects loaded + * with the RTLD_GLOBAL flag. + * The return value from GetModuleHandle( ) allows us to retrieve + * symbols only from the original program file. For objects loaded with + * the RTLD_GLOBAL flag, we create our own list later on. + */ + hModule = GetModuleHandle( NULL ); + + if( !hModule ) + save_err_ptr_str( file ); + } + else + { + char lpFileName[MAX_PATH]; + int i; + + /* MSDN says backslashes *must* be used instead of forward slashes. */ + for( i = 0 ; i < sizeof(lpFileName)-1 ; i++ ) + { + if( !file[i] ) + break; + else if( file[i] == '/' ) + lpFileName[i] = '\\'; + else + lpFileName[i] = file[i]; + } + lpFileName[i] = '\0'; + + /* POSIX says the search path is implementation-defined. + * LOAD_WITH_ALTERED_SEARCH_PATH is used to make it behave more closely + * to UNIX's search paths (start with system folders instead of current + * folder). + */ + hModule = LoadLibraryEx( (LPSTR) lpFileName, NULL, + LOAD_WITH_ALTERED_SEARCH_PATH ); + + /* If the object was loaded with RTLD_GLOBAL, add it to list of global + * objects, so that its symbols may be retrieved even if the handle for + * the original program file is passed. POSIX says that if the same + * file is specified in multiple invocations, and any of them are + * RTLD_GLOBAL, even if any further invocations use RTLD_LOCAL, the + * symbols will remain global. + */ + if( !hModule ) + save_err_str( lpFileName ); + else if( (mode & RTLD_GLOBAL) ) + global_add( hModule ); + } + + /* Return to previous state of the error-mode bit flags. */ + SetErrorMode( uMode ); + + return (void *) hModule; +} + +int dlclose( void *handle ) +{ + HMODULE hModule = (HMODULE) handle; + BOOL ret; + + current_error = NULL; + + ret = FreeLibrary( hModule ); + + /* If the object was loaded with RTLD_GLOBAL, remove it from list of global + * objects. + */ + if( ret ) + global_rem( hModule ); + else + save_err_ptr_str( handle ); + + /* dlclose's return value in inverted in relation to FreeLibrary's. */ + ret = !ret; + + return (int) ret; +} + +void *dlsym( void *handle, const char *name ) +{ + FARPROC symbol; + + current_error = NULL; + + symbol = GetProcAddress( handle, name ); + + if( symbol == NULL ) + { + HMODULE hModule; + + /* If the handle for the original program file is passed, also search + * in all globally loaded objects. + */ + + hModule = GetModuleHandle( NULL ); + + if( hModule == handle ) + { + global_object *pobject; + + for( pobject = &first_object; pobject ; pobject = pobject->next ) + { + if( pobject->hModule ) + { + symbol = GetProcAddress( pobject->hModule, name ); + if( symbol != NULL ) + break; + } + } + } + /* We don't need to close hModule since GetModuleHandle() + * Does not increment the refcount. + */ + } + + if( symbol == NULL ) + save_err_str( name ); + + return (void*) symbol; +} + +char *dlerror( void ) +{ + char *error_pointer = current_error; + + /* POSIX says that invoking dlerror( ) a second time, immediately following + * a prior invocation, shall result in NULL being returned. + */ + current_error = NULL; + + return error_pointer; +} diff --git a/rtt/os/win32/dlfcn.h b/rtt/os/win32/dlfcn.h index 626bc4c29..96a50fffb 100644 --- a/rtt/os/win32/dlfcn.h +++ b/rtt/os/win32/dlfcn.h @@ -1,63 +1,63 @@ -/* - * dlfcn-win32 - * Copyright (c) 2007 Ramiro Polla - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef DLFCN_H -#define DLFCN_H - -#include "../../rtt-config.h" - -/* POSIX says these are implementation-defined. - * To simplify use with Windows API, we treat them the same way. - */ - -#ifndef RTLD_LAZY -#define RTLD_LAZY 0 -#endif -#ifndef RTLD_NOW -#define RTLD_NOW 0 -#endif - -#ifndef RTLD_GLOBAL -#define RTLD_GLOBAL (1 << 1) -#endif -#ifndef RTLD_LOCAL -#define RTLD_LOCAL (1 << 2) -#endif - -/* These two were added in The Open Group Base Specifications Issue 6. - * Note: All other RTLD_* flags in any dlfcn.h are not standard compliant. - */ - -#define RTLD_DEFAULT 0 -#define RTLD_NEXT 0 - -#ifdef __cplusplus -extern "C" { -#endif - -RTT_API void *dlopen ( const char *file, int mode ); -RTT_API int dlclose( void *handle ); -RTT_API void *dlsym ( void *handle, const char *name ); -RTT_API char *dlerror( void ); - -#ifdef __cplusplus -} -#endif - -#endif /* DLFCN_H */ +/* + * dlfcn-win32 + * Copyright (c) 2007 Ramiro Polla + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef DLFCN_H +#define DLFCN_H + +#include "rtt/rtt-config.h" + +/* POSIX says these are implementation-defined. + * To simplify use with Windows API, we treat them the same way. + */ + +#ifndef RTLD_LAZY +#define RTLD_LAZY 0 +#endif +#ifndef RTLD_NOW +#define RTLD_NOW 0 +#endif + +#ifndef RTLD_GLOBAL +#define RTLD_GLOBAL (1 << 1) +#endif +#ifndef RTLD_LOCAL +#define RTLD_LOCAL (1 << 2) +#endif + +/* These two were added in The Open Group Base Specifications Issue 6. + * Note: All other RTLD_* flags in any dlfcn.h are not standard compliant. + */ + +#define RTLD_DEFAULT 0 +#define RTLD_NEXT 0 + +#ifdef __cplusplus +extern "C" { +#endif + +RTT_API void *dlopen ( const char *file, int mode ); +RTT_API int dlclose( void *handle ); +RTT_API void *dlsym ( void *handle, const char *name ); +RTT_API char *dlerror( void ); + +#ifdef __cplusplus +} +#endif + +#endif /* DLFCN_H */ diff --git a/rtt/os/win32/fosi.cpp b/rtt/os/win32/fosi.cpp index 9d4271dea..01d4ce561 100644 --- a/rtt/os/win32/fosi.cpp +++ b/rtt/os/win32/fosi.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "fosi.h" +#include "rtt/os/fosi.h" //linux specific //#include #include diff --git a/rtt/os/win32/fosi.h b/rtt/os/win32/fosi.h index 1b6084b35..54a3170f4 100644 --- a/rtt/os/win32/fosi.h +++ b/rtt/os/win32/fosi.h @@ -63,8 +63,8 @@ #include #endif -#include "../oro_limits.h" -#include "../../rtt-config.h" +#include "rtt/os/oro_limits.h" +#include "rtt/rtt-config.h" // Time Related #ifdef _MSC_VER @@ -80,7 +80,7 @@ extern "C" { #endif -#include "dlfcn.h" +#include "rtt/os/win32/dlfcn.h" RTT_API unsigned int sleep(unsigned int seconds); diff --git a/rtt/os/win32/fosi_internal.cpp b/rtt/os/win32/fosi_internal.cpp index c46f4eabe..71abc1499 100644 --- a/rtt/os/win32/fosi_internal.cpp +++ b/rtt/os/win32/fosi_internal.cpp @@ -36,10 +36,10 @@ ***************************************************************************/ -#include "../ThreadInterface.hpp" -#include "fosi.h" -#include "../fosi_internal_interface.hpp" -#include "../../Logger.hpp" +#include "rtt/os/ThreadInterface.hpp" +#include "rtt/os/fosi.h" +#include "rtt/os/fosi_internal_interface.hpp" +#include "rtt/Logger.hpp" #include #include #include diff --git a/rtt/os/win32/winthreads.cpp b/rtt/os/win32/winthreads.cpp index 6c3e215b3..ce9533327 100644 --- a/rtt/os/win32/winthreads.cpp +++ b/rtt/os/win32/winthreads.cpp @@ -37,7 +37,7 @@ -#include +#include "rtt/os/threads.hpp" #include namespace RTT diff --git a/rtt/os/xenomai/fosi.c b/rtt/os/xenomai/fosi.c index 3d0253ab9..7f5503e3f 100644 --- a/rtt/os/xenomai/fosi.c +++ b/rtt/os/xenomai/fosi.c @@ -36,4 +36,4 @@ ***************************************************************************/ #define OROBLD_OS_INTERNAL -#include "os/fosi.h" +#include "rtt/os/fosi.h" diff --git a/rtt/os/xenomai/fosi.h b/rtt/os/xenomai/fosi.h index faa398cf5..aa49dcd36 100644 --- a/rtt/os/xenomai/fosi.h +++ b/rtt/os/xenomai/fosi.h @@ -49,7 +49,7 @@ extern "C" { #endif -#include "../../rtt-config.h" +#include "rtt/rtt-config.h" //Xenomai headers //#include @@ -70,7 +70,7 @@ extern "C" { #include #include #include -#include "../oro_limits.h" +#include "rtt/os/oro_limits.h" #include // version number #include diff --git a/rtt/os/xenomai/fosi_internal.cpp b/rtt/os/xenomai/fosi_internal.cpp index ac60fd436..de7bf5732 100644 --- a/rtt/os/xenomai/fosi_internal.cpp +++ b/rtt/os/xenomai/fosi_internal.cpp @@ -38,13 +38,13 @@ #define OROBLD_OS_INTERNAL -#include "os/ThreadInterface.hpp" -#include "fosi.h" -#include "../fosi_internal_interface.hpp" +#include "rtt/os/ThreadInterface.hpp" +#include "rtt/os/fosi.h" +#include "rtt/os/fosi_internal_interface.hpp" #include #define INTERNAL_QUAL -#include "../../Logger.hpp" +#include "rtt/Logger.hpp" #include #include diff --git a/rtt/os/xenomai/xenothreads.cpp b/rtt/os/xenomai/xenothreads.cpp index 7a09df3a8..9f100c0aa 100644 --- a/rtt/os/xenomai/xenothreads.cpp +++ b/rtt/os/xenomai/xenothreads.cpp @@ -37,7 +37,7 @@ -#include +#include "rtt/os/threads.hpp" namespace RTT { namespace os { diff --git a/rtt/plugin/Plugin.hpp b/rtt/plugin/Plugin.hpp index 8f042d605..c6ee940ed 100644 --- a/rtt/plugin/Plugin.hpp +++ b/rtt/plugin/Plugin.hpp @@ -54,7 +54,7 @@ * process exits. */ #include -#include "../rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { class TaskContext; } diff --git a/rtt/plugin/PluginLoader.cpp b/rtt/plugin/PluginLoader.cpp index 5b5aee08b..ab9fed43b 100644 --- a/rtt/plugin/PluginLoader.cpp +++ b/rtt/plugin/PluginLoader.cpp @@ -43,14 +43,14 @@ * Author: kaltan */ -#include "PluginLoader.hpp" -#include "../TaskContext.hpp" -#include "../Logger.hpp" +#include "rtt/plugin/PluginLoader.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/Logger.hpp" #include #include -#include "../os/StartStopManager.hpp" -#include "../os/MutexLock.hpp" -#include "../internal/GlobalService.hpp" +#include "rtt/os/StartStopManager.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/internal/GlobalService.hpp" #include #include diff --git a/rtt/plugin/PluginLoader.hpp b/rtt/plugin/PluginLoader.hpp index 5133f0f41..b1d859190 100644 --- a/rtt/plugin/PluginLoader.hpp +++ b/rtt/plugin/PluginLoader.hpp @@ -43,9 +43,9 @@ #include #include -#include "../rtt-fwd.hpp" -#include "../rtt-config.h" -#include "../os/Mutex.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/rtt-config.h" +#include "rtt/os/Mutex.hpp" namespace RTT { namespace plugin { diff --git a/rtt/plugin/ServicePlugin.hpp b/rtt/plugin/ServicePlugin.hpp index 0fe1b8a7b..2582ea980 100644 --- a/rtt/plugin/ServicePlugin.hpp +++ b/rtt/plugin/ServicePlugin.hpp @@ -39,10 +39,10 @@ #ifndef ORO_SERVICEPLUGIN_HPP_ #define ORO_SERVICEPLUGIN_HPP_ -#include "Plugin.hpp" +#include "rtt/plugin/Plugin.hpp" #include -#include "../TaskContext.hpp" -#include "../internal/GlobalService.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/internal/GlobalService.hpp" namespace RTT { namespace plugin { diff --git a/rtt/plugin/pluginpath.cpp.in b/rtt/plugin/pluginpath.cpp.in index 93c714374..be3ce0b61 100644 --- a/rtt/plugin/pluginpath.cpp.in +++ b/rtt/plugin/pluginpath.cpp.in @@ -39,10 +39,10 @@ // WARNING: This is an auto-generated file by the build system. Do not modify it. // -#include "plugin/PluginLoader.hpp" +#include "rtt/plugin/PluginLoader.hpp" namespace RTT -{ +{ namespace plugin { /** @cond */ char const* default_plugin_path = "@DEFAULT_PLUGIN_PATH@"; diff --git a/rtt/rt_string.cpp b/rtt/rt_string.cpp index 91420aaba..9192bfb32 100644 --- a/rtt/rt_string.cpp +++ b/rtt/rt_string.cpp @@ -35,7 +35,7 @@ * * ***************************************************************************/ -#include "rt_string.hpp" +#include "rtt/rt_string.hpp" namespace std { diff --git a/rtt/rt_string.hpp b/rtt/rt_string.hpp index a2ca6771f..747ee11b8 100644 --- a/rtt/rt_string.hpp +++ b/rtt/rt_string.hpp @@ -39,8 +39,8 @@ #ifndef _RTT_RT_STRING_HPP #define _RTT_RT_STRING_HPP 1 -#include "os/oro_allocator.hpp" -#include "rtt-config.h" +#include "rtt/os/oro_allocator.hpp" +#include "rtt/rtt-config.h" #include #include diff --git a/rtt/rtt-config.h.in b/rtt/rtt-config.h.in index 41cc7f227..beb2b8bf6 100644 --- a/rtt/rtt-config.h.in +++ b/rtt/rtt-config.h.in @@ -57,7 +57,7 @@ #error "You _must_ define OROCOS_TARGET to an installed target (for example: -DOROCOS_TARGET=gnulinux )" #endif -#include "os/targets/rtt-target.h" +#include "rtt/os/targets/rtt-target.h" // Detect the CPU we are compiling for #if defined( __GNUC__ ) @@ -123,12 +123,12 @@ # elif defined(RTT_DLL_EXPORT) # define RTT_API __declspec(dllexport) # define RTT_EXPORT __declspec(dllexport) -# define RTT_HIDE +# define RTT_HIDE # define RTT_EXT_IMPL extern # else # define RTT_API __declspec(dllimport) # define RTT_EXPORT __declspec(dllexport) -# define RTT_HIDE +# define RTT_HIDE # define RTT_EXT_IMPL extern # endif # else diff --git a/rtt/rtt-fwd.hpp b/rtt/rtt-fwd.hpp index 3a44b8131..bdaf1ce79 100644 --- a/rtt/rtt-fwd.hpp +++ b/rtt/rtt-fwd.hpp @@ -39,12 +39,12 @@ #ifndef ORO_RTT_FWD_HPP #define ORO_RTT_FWD_HPP -#include "rtt-detail-fwd.hpp" -#include "os/rtt-os-fwd.hpp" -#include "base/rtt-base-fwd.hpp" -#include "internal/rtt-internal-fwd.hpp" -#include "plugin/rtt-plugin-fwd.hpp" -#include "types/rtt-types-fwd.hpp" +#include "rtt/rtt-detail-fwd.hpp" +#include "rtt/os/rtt-os-fwd.hpp" +#include "rtt/base/rtt-base-fwd.hpp" +#include "rtt/internal/rtt-internal-fwd.hpp" +#include "rtt/plugin/rtt-plugin-fwd.hpp" +#include "rtt/types/rtt-types-fwd.hpp" #include diff --git a/rtt/scripting/ArgumentsParser.cpp b/rtt/scripting/ArgumentsParser.cpp index 479b87318..9bbb886aa 100644 --- a/rtt/scripting/ArgumentsParser.cpp +++ b/rtt/scripting/ArgumentsParser.cpp @@ -35,17 +35,17 @@ * * ***************************************************************************/ -#include "parser-debug.hpp" +#include "rtt/scripting/parser-debug.hpp" #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "ArgumentsParser.hpp" +#include "rtt/scripting/ArgumentsParser.hpp" #include #include -#include "ExpressionParser.hpp" -#include "../TaskContext.hpp" +#include "rtt/scripting/ExpressionParser.hpp" +#include "rtt/TaskContext.hpp" namespace RTT diff --git a/rtt/scripting/ArgumentsParser.hpp b/rtt/scripting/ArgumentsParser.hpp index a363c8eae..2875d1457 100644 --- a/rtt/scripting/ArgumentsParser.hpp +++ b/rtt/scripting/ArgumentsParser.hpp @@ -38,11 +38,11 @@ #ifndef ARGUMENTSPARSER_HPP #define ARGUMENTSPARSER_HPP -#include "parser-types.hpp" +#include "rtt/scripting/parser-types.hpp" -#include "../PropertyBag.hpp" -#include "CommonParser.hpp" -#include "../TaskContext.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/scripting/CommonParser.hpp" +#include "rtt/TaskContext.hpp" #ifdef ORO_PRAGMA_INTERFACE #pragma interface diff --git a/rtt/scripting/CallFunction.hpp b/rtt/scripting/CallFunction.hpp index 1ca0199a7..860932200 100644 --- a/rtt/scripting/CallFunction.hpp +++ b/rtt/scripting/CallFunction.hpp @@ -39,13 +39,13 @@ #ifndef ORO_CALL_FUNCTION_HPP #define ORO_CALL_FUNCTION_HPP -#include "../base/ActionInterface.hpp" -#include "../base/DisposableInterface.hpp" -#include "../internal/DataSources.hpp" -#include "ProgramInterface.hpp" -#include "../internal/DataSource.hpp" -#include "../ExecutionEngine.hpp" -#include "../Logger.hpp" +#include "rtt/base/ActionInterface.hpp" +#include "rtt/base/DisposableInterface.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/scripting/ProgramInterface.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/ExecutionEngine.hpp" +#include "rtt/Logger.hpp" #include #include diff --git a/rtt/scripting/CommandBinary.hpp b/rtt/scripting/CommandBinary.hpp index 198a92500..43945938a 100644 --- a/rtt/scripting/CommandBinary.hpp +++ b/rtt/scripting/CommandBinary.hpp @@ -39,8 +39,8 @@ #ifndef ORO_COMMANDBINARY_HPP #define ORO_COMMANDBINARY_HPP -#include "../base/ActionInterface.hpp" -#include "../internal/DataSource.hpp" +#include "rtt/base/ActionInterface.hpp" +#include "rtt/internal/DataSource.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/CommandComposite.hpp b/rtt/scripting/CommandComposite.hpp index c94ef6a43..5834423be 100644 --- a/rtt/scripting/CommandComposite.hpp +++ b/rtt/scripting/CommandComposite.hpp @@ -36,9 +36,9 @@ ***************************************************************************/ -#include "../base/ActionInterface.hpp" +#include "rtt/base/ActionInterface.hpp" #include -#include "rtt-scripting-config.h" +#include "rtt/scripting/rtt-scripting-config.h" namespace RTT { namespace scripting { diff --git a/rtt/scripting/CommandCounter.cpp b/rtt/scripting/CommandCounter.cpp index 2e853af9d..2e9561f82 100644 --- a/rtt/scripting/CommandCounter.cpp +++ b/rtt/scripting/CommandCounter.cpp @@ -34,7 +34,7 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "CommandCounter.hpp" +#include "rtt/scripting/CommandCounter.hpp" namespace RTT { using namespace scripting; diff --git a/rtt/scripting/CommandCounter.hpp b/rtt/scripting/CommandCounter.hpp index e3f45bd65..a989a34b1 100644 --- a/rtt/scripting/CommandCounter.hpp +++ b/rtt/scripting/CommandCounter.hpp @@ -38,8 +38,8 @@ #ifndef COMMANDCOUNTER_HPP #define COMMANDCOUNTER_HPP -#include "rtt-scripting-config.h" -#include "../base/ActionInterface.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/base/ActionInterface.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/CommandDataSource.hpp b/rtt/scripting/CommandDataSource.hpp index faef27f66..9ed10445a 100644 --- a/rtt/scripting/CommandDataSource.hpp +++ b/rtt/scripting/CommandDataSource.hpp @@ -39,8 +39,8 @@ #ifndef ORO_COMMAND_DATASOURCE_HPP #define ORO_COMMAND_DATASOURCE_HPP -#include "../internal/DataSource.hpp" -#include "../base/ActionInterface.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/base/ActionInterface.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/CommandFunctors.hpp b/rtt/scripting/CommandFunctors.hpp index 2e30af357..12b533d0c 100644 --- a/rtt/scripting/CommandFunctors.hpp +++ b/rtt/scripting/CommandFunctors.hpp @@ -43,8 +43,8 @@ #include #include -#include "../base/ActionInterface.hpp" -#include "ConditionInterface.hpp" +#include "rtt/base/ActionInterface.hpp" +#include "rtt/scripting/ConditionInterface.hpp" namespace RTT { diff --git a/rtt/scripting/CommandIllegal.cpp b/rtt/scripting/CommandIllegal.cpp index 0132feb13..6c0c74723 100644 --- a/rtt/scripting/CommandIllegal.cpp +++ b/rtt/scripting/CommandIllegal.cpp @@ -34,7 +34,7 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "CommandIllegal.hpp" +#include "rtt/scripting/CommandIllegal.hpp" #include namespace RTT { diff --git a/rtt/scripting/CommandIllegal.hpp b/rtt/scripting/CommandIllegal.hpp index ee670eeb6..1560a7811 100644 --- a/rtt/scripting/CommandIllegal.hpp +++ b/rtt/scripting/CommandIllegal.hpp @@ -38,8 +38,8 @@ #ifndef COMMANDILLEGAL_HPP #define COMMANDILLEGAL_HPP -#include "rtt-scripting-config.h" -#include "../base/ActionInterface.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/base/ActionInterface.hpp" #include namespace RTT diff --git a/rtt/scripting/CommandNOP.cpp b/rtt/scripting/CommandNOP.cpp index c357ef8d4..c9cdaa9d1 100644 --- a/rtt/scripting/CommandNOP.cpp +++ b/rtt/scripting/CommandNOP.cpp @@ -34,7 +34,7 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "CommandNOP.hpp" +#include "rtt/scripting/CommandNOP.hpp" namespace RTT { using namespace scripting; diff --git a/rtt/scripting/CommandNOP.hpp b/rtt/scripting/CommandNOP.hpp index 946ebc50d..40a8da05b 100644 --- a/rtt/scripting/CommandNOP.hpp +++ b/rtt/scripting/CommandNOP.hpp @@ -38,8 +38,8 @@ #ifndef COMMANDNOP_HPP #define COMMANDNOP_HPP -#include "rtt-scripting-config.h" -#include "../base/ActionInterface.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/base/ActionInterface.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/CommandString.cpp b/rtt/scripting/CommandString.cpp index 017d31dbc..68da7c473 100644 --- a/rtt/scripting/CommandString.cpp +++ b/rtt/scripting/CommandString.cpp @@ -34,7 +34,7 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "CommandString.hpp" +#include "rtt/scripting/CommandString.hpp" #include diff --git a/rtt/scripting/CommandString.hpp b/rtt/scripting/CommandString.hpp index 3bc300ba1..356b6be11 100644 --- a/rtt/scripting/CommandString.hpp +++ b/rtt/scripting/CommandString.hpp @@ -35,8 +35,8 @@ * * ***************************************************************************/ -#include "rtt-scripting-config.h" -#include "../base/ActionInterface.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/base/ActionInterface.hpp" #include diff --git a/rtt/scripting/CommonParser.cpp b/rtt/scripting/CommonParser.cpp index 1a0c058e7..a80223ff2 100644 --- a/rtt/scripting/CommonParser.cpp +++ b/rtt/scripting/CommonParser.cpp @@ -36,9 +36,9 @@ ***************************************************************************/ #include -#include "parse_exception.hpp" -#include "parser-debug.hpp" -#include "CommonParser.hpp" +#include "rtt/scripting/parse_exception.hpp" +#include "rtt/scripting/parser-debug.hpp" +#include "rtt/scripting/CommonParser.hpp" namespace RTT { using boost::bind; diff --git a/rtt/scripting/CommonParser.hpp b/rtt/scripting/CommonParser.hpp index 009c1c0db..ec8dd6690 100644 --- a/rtt/scripting/CommonParser.hpp +++ b/rtt/scripting/CommonParser.hpp @@ -37,8 +37,8 @@ #ifndef COMMONPARSER_HPP #define COMMONPARSER_HPP -#include "parser-types.hpp" -#include "../rtt-config.h" +#include "rtt/scripting/parser-types.hpp" +#include "rtt/rtt-config.h" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ConditionBool.cpp b/rtt/scripting/ConditionBool.cpp index 78518720f..92fe29b74 100644 --- a/rtt/scripting/ConditionBool.cpp +++ b/rtt/scripting/ConditionBool.cpp @@ -34,7 +34,7 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "ConditionBool.hpp" +#include "rtt/scripting/ConditionBool.hpp" namespace RTT { using namespace scripting; diff --git a/rtt/scripting/ConditionBool.hpp b/rtt/scripting/ConditionBool.hpp index 9bec1925c..aedd5b6e8 100644 --- a/rtt/scripting/ConditionBool.hpp +++ b/rtt/scripting/ConditionBool.hpp @@ -39,8 +39,8 @@ #ifndef CONDITIONBOOL_HPP #define CONDITIONBOOL_HPP -#include "rtt-scripting-config.h" -#include "ConditionInterface.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/scripting/ConditionInterface.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ConditionBoolDataSource.cpp b/rtt/scripting/ConditionBoolDataSource.cpp index 0bc006fd5..8c151e0cd 100644 --- a/rtt/scripting/ConditionBoolDataSource.cpp +++ b/rtt/scripting/ConditionBoolDataSource.cpp @@ -34,7 +34,7 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "ConditionBoolDataSource.hpp" +#include "rtt/scripting/ConditionBoolDataSource.hpp" namespace RTT { using namespace detail; diff --git a/rtt/scripting/ConditionBoolDataSource.hpp b/rtt/scripting/ConditionBoolDataSource.hpp index 01eeb7f68..9eddc1e1d 100644 --- a/rtt/scripting/ConditionBoolDataSource.hpp +++ b/rtt/scripting/ConditionBoolDataSource.hpp @@ -38,9 +38,9 @@ #ifndef CONDITIONBOOLDATASOURCE_HPP #define CONDITIONBOOLDATASOURCE_HPP -#include "rtt-scripting-config.h" -#include "ConditionInterface.hpp" -#include "../internal/DataSource.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/scripting/ConditionInterface.hpp" +#include "rtt/internal/DataSource.hpp" namespace RTT diff --git a/rtt/scripting/ConditionBoolProperty.cpp b/rtt/scripting/ConditionBoolProperty.cpp index 7f682f13d..9b3ceb182 100644 --- a/rtt/scripting/ConditionBoolProperty.cpp +++ b/rtt/scripting/ConditionBoolProperty.cpp @@ -34,7 +34,7 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "ConditionBoolProperty.hpp" +#include "rtt/scripting/ConditionBoolProperty.hpp" namespace RTT { using namespace detail; diff --git a/rtt/scripting/ConditionBoolProperty.hpp b/rtt/scripting/ConditionBoolProperty.hpp index a85c9d047..4c8b4971d 100644 --- a/rtt/scripting/ConditionBoolProperty.hpp +++ b/rtt/scripting/ConditionBoolProperty.hpp @@ -38,9 +38,9 @@ #ifndef CONDITIONBOOLPROPERTY_HPP #define CONDITIONBOOLPROPERTY_HPP -#include "rtt-scripting-config.h" -#include "ConditionInterface.hpp" -#include "../Property.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/scripting/ConditionInterface.hpp" +#include "rtt/Property.hpp" diff --git a/rtt/scripting/ConditionCache.hpp b/rtt/scripting/ConditionCache.hpp index 45c390388..855bdebe8 100644 --- a/rtt/scripting/ConditionCache.hpp +++ b/rtt/scripting/ConditionCache.hpp @@ -39,8 +39,8 @@ #ifndef CONDITION_CACHE_HPP #define CONDITION_CACHE_HPP -#include "ConditionInterface.hpp" -#include "../internal/DataSources.hpp" +#include "rtt/scripting/ConditionInterface.hpp" +#include "rtt/internal/DataSources.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ConditionCompare.hpp b/rtt/scripting/ConditionCompare.hpp index b2c158f87..775ad4893 100644 --- a/rtt/scripting/ConditionCompare.hpp +++ b/rtt/scripting/ConditionCompare.hpp @@ -38,8 +38,8 @@ #ifndef CONDITIONCOMPARE_HPP #define CONDITIONCOMPARE_HPP -#include "ConditionInterface.hpp" -#include "../internal/DataSource.hpp" +#include "rtt/scripting/ConditionInterface.hpp" +#include "rtt/internal/DataSource.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ConditionComposite.cpp b/rtt/scripting/ConditionComposite.cpp index c5cfcf2c2..28c653f42 100644 --- a/rtt/scripting/ConditionComposite.cpp +++ b/rtt/scripting/ConditionComposite.cpp @@ -34,7 +34,7 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "ConditionComposite.hpp" +#include "rtt/scripting/ConditionComposite.hpp" namespace RTT { using namespace scripting; diff --git a/rtt/scripting/ConditionComposite.hpp b/rtt/scripting/ConditionComposite.hpp index 359681cb8..a47dc9006 100644 --- a/rtt/scripting/ConditionComposite.hpp +++ b/rtt/scripting/ConditionComposite.hpp @@ -38,8 +38,8 @@ #ifndef CONDITIONCOMPOSITE_HPP #define CONDITIONCOMPOSITE_HPP -#include "rtt-scripting-config.h" -#include "ConditionInterface.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/scripting/ConditionInterface.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ConditionDSDuration.cpp b/rtt/scripting/ConditionDSDuration.cpp index 9cae45334..bbf1f22b2 100644 --- a/rtt/scripting/ConditionDSDuration.cpp +++ b/rtt/scripting/ConditionDSDuration.cpp @@ -37,7 +37,7 @@ -#include "ConditionDSDuration.hpp" +#include "rtt/scripting/ConditionDSDuration.hpp" namespace RTT { using namespace detail; diff --git a/rtt/scripting/ConditionDSDuration.hpp b/rtt/scripting/ConditionDSDuration.hpp index 14481ea46..ef9aaa089 100644 --- a/rtt/scripting/ConditionDSDuration.hpp +++ b/rtt/scripting/ConditionDSDuration.hpp @@ -39,10 +39,10 @@ #ifndef CONDITION_DS_DURATION_HPP #define CONDITION_DS_DURATION_HPP -#include "rtt-scripting-config.h" -#include "ConditionInterface.hpp" -#include "../os/TimeService.hpp" -#include "../internal/DataSource.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/scripting/ConditionInterface.hpp" +#include "rtt/os/TimeService.hpp" +#include "rtt/internal/DataSource.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ConditionDuration.cpp b/rtt/scripting/ConditionDuration.cpp index 14bf47400..491602974 100644 --- a/rtt/scripting/ConditionDuration.cpp +++ b/rtt/scripting/ConditionDuration.cpp @@ -37,7 +37,7 @@ -#include "ConditionDuration.hpp" +#include "rtt/scripting/ConditionDuration.hpp" namespace RTT { using namespace os; diff --git a/rtt/scripting/ConditionDuration.hpp b/rtt/scripting/ConditionDuration.hpp index e6f222e3e..3f598da4d 100644 --- a/rtt/scripting/ConditionDuration.hpp +++ b/rtt/scripting/ConditionDuration.hpp @@ -39,9 +39,9 @@ #ifndef CONDITIONDURATION_HPP #define CONDITIONDURATION_HPP -#include "rtt-scripting-config.h" -#include "ConditionInterface.hpp" -#include "../os/TimeService.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/scripting/ConditionInterface.hpp" +#include "rtt/os/TimeService.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ConditionExpire.hpp b/rtt/scripting/ConditionExpire.hpp index ec15073ab..bce5f4c2f 100644 --- a/rtt/scripting/ConditionExpire.hpp +++ b/rtt/scripting/ConditionExpire.hpp @@ -39,8 +39,8 @@ #ifndef CONDITIONEXPIRE_HPP #define CONDITIONEXPIRE_HPP -#include "ConditionInterface.hpp" -#include "../os/TimeService.hpp" +#include "rtt/scripting/ConditionInterface.hpp" +#include "rtt/os/TimeService.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ConditionFalse.hpp b/rtt/scripting/ConditionFalse.hpp index 6c93599e7..9486d2066 100644 --- a/rtt/scripting/ConditionFalse.hpp +++ b/rtt/scripting/ConditionFalse.hpp @@ -39,7 +39,7 @@ #ifndef CONDITIONFALSE_HPP #define CONDITIONFALSE_HPP -#include "ConditionInterface.hpp" +#include "rtt/scripting/ConditionInterface.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ConditionInterface.cpp b/rtt/scripting/ConditionInterface.cpp index 7b4114fb4..fd24df40f 100644 --- a/rtt/scripting/ConditionInterface.cpp +++ b/rtt/scripting/ConditionInterface.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "ConditionInterface.hpp" +#include "rtt/scripting/ConditionInterface.hpp" namespace RTT { using namespace base; diff --git a/rtt/scripting/ConditionInterface.hpp b/rtt/scripting/ConditionInterface.hpp index 765488577..effcdebd7 100644 --- a/rtt/scripting/ConditionInterface.hpp +++ b/rtt/scripting/ConditionInterface.hpp @@ -40,8 +40,8 @@ #define CONDITIONINTERFACE_HPP #include -#include "rtt-scripting-config.h" -#include "../base/rtt-base-fwd.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/base/rtt-base-fwd.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ConditionInvert.hpp b/rtt/scripting/ConditionInvert.hpp index 541bce4bc..26f09c28b 100644 --- a/rtt/scripting/ConditionInvert.hpp +++ b/rtt/scripting/ConditionInvert.hpp @@ -40,7 +40,7 @@ #ifndef CONDITIONINVERT_HPP #define CONDITIONINVERT_HPP -#include "ConditionInterface.hpp" +#include "rtt/scripting/ConditionInterface.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ConditionOnce.cpp b/rtt/scripting/ConditionOnce.cpp index 7e1f4b95d..394ff2524 100644 --- a/rtt/scripting/ConditionOnce.cpp +++ b/rtt/scripting/ConditionOnce.cpp @@ -37,7 +37,7 @@ -#include "ConditionOnce.hpp" +#include "rtt/scripting/ConditionOnce.hpp" namespace RTT { using namespace scripting; diff --git a/rtt/scripting/ConditionOnce.hpp b/rtt/scripting/ConditionOnce.hpp index ab7ded000..2223b48ac 100644 --- a/rtt/scripting/ConditionOnce.hpp +++ b/rtt/scripting/ConditionOnce.hpp @@ -39,8 +39,8 @@ #ifndef CONDITIONONCE_HPP #define CONDITIONONCE_HPP -#include "ConditionInterface.hpp" -#include "rtt-scripting-config.h" +#include "rtt/scripting/ConditionInterface.hpp" +#include "rtt/scripting/rtt-scripting-config.h" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ConditionParser.cpp b/rtt/scripting/ConditionParser.cpp index 4abb6b6ef..c2bfa45f3 100644 --- a/rtt/scripting/ConditionParser.cpp +++ b/rtt/scripting/ConditionParser.cpp @@ -35,22 +35,22 @@ * * ***************************************************************************/ -#include "parser-debug.hpp" -#include "parse_exception.hpp" +#include "rtt/scripting/parser-debug.hpp" +#include "rtt/scripting/parse_exception.hpp" #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "ConditionParser.hpp" +#include "rtt/scripting/ConditionParser.hpp" -#include "ConditionDuration.hpp" -#include "ConditionTrue.hpp" -#include "ConditionFalse.hpp" -#include "ConditionBoolDataSource.hpp" -#include "ConditionComposite.hpp" +#include "rtt/scripting/ConditionDuration.hpp" +#include "rtt/scripting/ConditionTrue.hpp" +#include "rtt/scripting/ConditionFalse.hpp" +#include "rtt/scripting/ConditionBoolDataSource.hpp" +#include "rtt/scripting/ConditionComposite.hpp" #include -#include "TryCommand.hpp" +#include "rtt/scripting/TryCommand.hpp" namespace RTT { diff --git a/rtt/scripting/ConditionParser.hpp b/rtt/scripting/ConditionParser.hpp index a93171ac9..fc4e0c548 100644 --- a/rtt/scripting/ConditionParser.hpp +++ b/rtt/scripting/ConditionParser.hpp @@ -38,10 +38,10 @@ #ifndef CONDITIONPARSER_HPP #define CONDITIONPARSER_HPP -#include "parser-types.hpp" -#include "CommonParser.hpp" -#include "ExpressionParser.hpp" -#include "../internal/DataSource.hpp" +#include "rtt/scripting/parser-types.hpp" +#include "rtt/scripting/CommonParser.hpp" +#include "rtt/scripting/ExpressionParser.hpp" +#include "rtt/internal/DataSource.hpp" #include #include diff --git a/rtt/scripting/ConditionTrue.hpp b/rtt/scripting/ConditionTrue.hpp index b06e804c7..d13c45925 100644 --- a/rtt/scripting/ConditionTrue.hpp +++ b/rtt/scripting/ConditionTrue.hpp @@ -39,8 +39,8 @@ #ifndef CONDITIONTRUE_HPP #define CONDITIONTRUE_HPP -#include "rtt-scripting-config.h" -#include "ConditionInterface.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/scripting/ConditionInterface.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/DataSourceCondition.cpp b/rtt/scripting/DataSourceCondition.cpp index e0a241725..fbb10fef7 100644 --- a/rtt/scripting/DataSourceCondition.cpp +++ b/rtt/scripting/DataSourceCondition.cpp @@ -34,9 +34,9 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "DataSourceCondition.hpp" +#include "rtt/scripting/DataSourceCondition.hpp" -#include "ConditionInterface.hpp" +#include "rtt/scripting/ConditionInterface.hpp" namespace RTT { using namespace detail; diff --git a/rtt/scripting/DataSourceCondition.hpp b/rtt/scripting/DataSourceCondition.hpp index b54e0df41..efbcbf798 100644 --- a/rtt/scripting/DataSourceCondition.hpp +++ b/rtt/scripting/DataSourceCondition.hpp @@ -38,9 +38,9 @@ #ifndef DATASOURCECONDITION_HPP #define DATASOURCECONDITION_HPP -#include "rtt-scripting-config.h" -#include "../internal/DataSource.hpp" -#include "ConditionInterface.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/internal/DataSource.hpp" +#include "rtt/scripting/ConditionInterface.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/DataSourceTime.hpp b/rtt/scripting/DataSourceTime.hpp index 44c530547..7dfb3607b 100644 --- a/rtt/scripting/DataSourceTime.hpp +++ b/rtt/scripting/DataSourceTime.hpp @@ -36,9 +36,9 @@ ***************************************************************************/ -#include "../os/TimeService.hpp" -#include "../internal/DataSource.hpp" -#include "rtt-scripting-config.h" +#include "rtt/os/TimeService.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/scripting/rtt-scripting-config.h" namespace RTT { namespace scripting { diff --git a/rtt/scripting/DumpObject.cpp b/rtt/scripting/DumpObject.cpp index 870fb6318..a3c25160f 100644 --- a/rtt/scripting/DumpObject.cpp +++ b/rtt/scripting/DumpObject.cpp @@ -39,11 +39,11 @@ #include #include #include -#include "../base/DataSourceBase.hpp" -#include "../Service.hpp" -#include "../Service.hpp" -#include "DumpObject.hpp" -#include "rtt-fwd.hpp" +#include "rtt/base/DataSourceBase.hpp" +#include "rtt/Service.hpp" +#include "rtt/Service.hpp" +#include "rtt/scripting/DumpObject.hpp" +#include "rtt/rtt-fwd.hpp" using namespace std; diff --git a/rtt/scripting/DumpObject.hpp b/rtt/scripting/DumpObject.hpp index 64eac537e..1bc24258a 100644 --- a/rtt/scripting/DumpObject.hpp +++ b/rtt/scripting/DumpObject.hpp @@ -39,9 +39,9 @@ #ifndef ORO_DUMP_OBJECT_HPP #define ORO_DUMP_OBJECT_HPP -#include "rtt-scripting-config.h" -#include "../rtt-fwd.hpp" -#include "../Service.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/rtt-fwd.hpp" +#include "rtt/Service.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/EdgeCondition.cpp b/rtt/scripting/EdgeCondition.cpp index 6ce549061..1b6ecf8ea 100644 --- a/rtt/scripting/EdgeCondition.cpp +++ b/rtt/scripting/EdgeCondition.cpp @@ -34,10 +34,10 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "EdgeCondition.hpp" -#include "ConditionTrue.hpp" -#include "ConditionInterface.hpp" -#include "../internal/DataSource.hpp" +#include "rtt/scripting/EdgeCondition.hpp" +#include "rtt/scripting/ConditionTrue.hpp" +#include "rtt/scripting/ConditionInterface.hpp" +#include "rtt/internal/DataSource.hpp" namespace RTT { using namespace detail; diff --git a/rtt/scripting/EdgeCondition.hpp b/rtt/scripting/EdgeCondition.hpp index 2b805c3a2..772fc2e41 100644 --- a/rtt/scripting/EdgeCondition.hpp +++ b/rtt/scripting/EdgeCondition.hpp @@ -39,9 +39,9 @@ #define EDGECONDITION_HPP #include -#include "rtt-scripting-config.h" -#include "../base/rtt-base-fwd.hpp" -#include "rtt-scripting-fwd.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/base/rtt-base-fwd.hpp" +#include "rtt/scripting/rtt-scripting-fwd.hpp" // adjacency_list has some very short template parameter names, // which may be defined as macros on some OS's. So undef here. #undef DS diff --git a/rtt/scripting/ExpressionParser.cpp b/rtt/scripting/ExpressionParser.cpp index 0614abf7c..f32467559 100644 --- a/rtt/scripting/ExpressionParser.cpp +++ b/rtt/scripting/ExpressionParser.cpp @@ -35,32 +35,32 @@ * * ***************************************************************************/ -#include "parser-debug.hpp" -#include "parse_exception.hpp" +#include "rtt/scripting/parser-debug.hpp" +#include "rtt/scripting/parse_exception.hpp" #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "ExpressionParser.hpp" +#include "rtt/scripting/ExpressionParser.hpp" //#include "DumpObject.hpp" -#include "ArgumentsParser.hpp" -#include "../types/Operators.hpp" -#include "DataSourceCondition.hpp" -#include "../internal/DataSourceCommand.hpp" -#include "../internal/GlobalService.hpp" +#include "rtt/scripting/ArgumentsParser.hpp" +#include "rtt/types/Operators.hpp" +#include "rtt/scripting/DataSourceCondition.hpp" +#include "rtt/internal/DataSourceCommand.hpp" +#include "rtt/internal/GlobalService.hpp" -#include "DataSourceTime.hpp" -#include "../TaskContext.hpp" -#include "PeerParser.hpp" -#include "../types/Types.hpp" -#include "SendHandleAlias.hpp" +#include "rtt/scripting/DataSourceTime.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/scripting/PeerParser.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/scripting/SendHandleAlias.hpp" #include #include #include -#include "rtt-scripting-config.h" +#include "rtt/scripting/rtt-scripting-config.h" #include namespace RTT diff --git a/rtt/scripting/ExpressionParser.hpp b/rtt/scripting/ExpressionParser.hpp index bd6e14bda..d1ebc30dc 100644 --- a/rtt/scripting/ExpressionParser.hpp +++ b/rtt/scripting/ExpressionParser.hpp @@ -38,13 +38,13 @@ #ifndef EXPRESSIONPARSER_HPP #define EXPRESSIONPARSER_HPP -#include "parser-types.hpp" -#include "CommonParser.hpp" -#include "PeerParser.hpp" -#include "ValueParser.hpp" -#include "../internal/DataSource.hpp" -#include "../types/Operators.hpp" -#include "../Time.hpp" +#include "rtt/scripting/parser-types.hpp" +#include "rtt/scripting/CommonParser.hpp" +#include "rtt/scripting/PeerParser.hpp" +#include "rtt/scripting/ValueParser.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/types/Operators.hpp" +#include "rtt/Time.hpp" #include diff --git a/rtt/scripting/FunctionFactory.cpp b/rtt/scripting/FunctionFactory.cpp index 3dcba4dee..032a27f63 100644 --- a/rtt/scripting/FunctionFactory.cpp +++ b/rtt/scripting/FunctionFactory.cpp @@ -36,26 +36,26 @@ ***************************************************************************/ -#include "FunctionFactory.hpp" - -#include "../ExecutionEngine.hpp" -#include "../internal/GlobalEngine.hpp" -#include "CommandComposite.hpp" -#include "CommandBinary.hpp" -#include "CallFunction.hpp" -#include "ConditionComposite.hpp" -#include "TryCommand.hpp" +#include "rtt/scripting/FunctionFactory.hpp" + +#include "rtt/ExecutionEngine.hpp" +#include "rtt/internal/GlobalEngine.hpp" +#include "rtt/scripting/CommandComposite.hpp" +#include "rtt/scripting/CommandBinary.hpp" +#include "rtt/scripting/CallFunction.hpp" +#include "rtt/scripting/ConditionComposite.hpp" +#include "rtt/scripting/TryCommand.hpp" #include #include #include -#include "../internal/mystd.hpp" -#include -#include -#include "../Attribute.hpp" -#include "parse_exception.hpp" -#include "../internal/DataSourceCommand.hpp" -#include "../FactoryExceptions.hpp" -#include "../../Handle.hpp" +#include "rtt/internal/mystd.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/Property.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/scripting/parse_exception.hpp" +#include "rtt/internal/DataSourceCommand.hpp" +#include "rtt/FactoryExceptions.hpp" +#include "rtt/Handle.hpp" namespace RTT { diff --git a/rtt/scripting/FunctionFactory.hpp b/rtt/scripting/FunctionFactory.hpp index 0cde9f6e4..d141c1ec8 100644 --- a/rtt/scripting/FunctionFactory.hpp +++ b/rtt/scripting/FunctionFactory.hpp @@ -39,10 +39,10 @@ #ifndef FUNCTIONFACTORY_HPP #define FUNCTIONFACTORY_HPP -#include "../ArgumentDescription.hpp" -#include "../OperationInterface.hpp" -#include "../Property.hpp" -#include "ProgramInterface.hpp" +#include "rtt/ArgumentDescription.hpp" +#include "rtt/OperationInterface.hpp" +#include "rtt/Property.hpp" +#include "rtt/scripting/ProgramInterface.hpp" #include #include diff --git a/rtt/scripting/FunctionGraph.cpp b/rtt/scripting/FunctionGraph.cpp index f7af24ee3..466880fea 100644 --- a/rtt/scripting/FunctionGraph.cpp +++ b/rtt/scripting/FunctionGraph.cpp @@ -36,16 +36,16 @@ ***************************************************************************/ -#include "FunctionGraph.hpp" -#include "GraphCopier.hpp" -#include "../base/AttributeBase.hpp" -#include "ProgramService.hpp" -#include "TaskContext.hpp" -#include "../Service.hpp" - -#include "CommandNOP.hpp" -#include "ConditionFalse.hpp" -#include "ConditionTrue.hpp" +#include "rtt/scripting/FunctionGraph.hpp" +#include "rtt/scripting/GraphCopier.hpp" +#include "rtt/base/AttributeBase.hpp" +#include "rtt/scripting/ProgramService.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/Service.hpp" + +#include "rtt/scripting/CommandNOP.hpp" +#include "rtt/scripting/ConditionFalse.hpp" +#include "rtt/scripting/ConditionTrue.hpp" #include #include diff --git a/rtt/scripting/FunctionGraph.hpp b/rtt/scripting/FunctionGraph.hpp index 2633f84c6..9b8241e61 100644 --- a/rtt/scripting/FunctionGraph.hpp +++ b/rtt/scripting/FunctionGraph.hpp @@ -38,12 +38,12 @@ #ifndef FUNCTION_GRAPH_HPP #define FUNCTION_GRAPH_HPP -#include "VertexNode.hpp" -#include "EdgeCondition.hpp" -#include "CommandNOP.hpp" -#include "rtt-scripting-config.h" -#include "../base/AttributeBase.hpp" -#include "ProgramInterface.hpp" +#include "rtt/scripting/VertexNode.hpp" +#include "rtt/scripting/EdgeCondition.hpp" +#include "rtt/scripting/CommandNOP.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/base/AttributeBase.hpp" +#include "rtt/scripting/ProgramInterface.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/FunctionGraphBuilder.cpp b/rtt/scripting/FunctionGraphBuilder.cpp index d8ffcb578..82d574451 100644 --- a/rtt/scripting/FunctionGraphBuilder.cpp +++ b/rtt/scripting/FunctionGraphBuilder.cpp @@ -37,18 +37,18 @@ -#include "FunctionGraphBuilder.hpp" -#include "CommandComposite.hpp" -#include "../base/AttributeBase.hpp" -#include "../internal/DataSource.hpp" +#include "rtt/scripting/FunctionGraphBuilder.hpp" +#include "rtt/scripting/CommandComposite.hpp" +#include "rtt/base/AttributeBase.hpp" +#include "rtt/internal/DataSource.hpp" //#include "parse_exception.hpp" -#include "../FactoryExceptions.hpp" -#include "GraphCopier.hpp" +#include "rtt/FactoryExceptions.hpp" +#include "rtt/scripting/GraphCopier.hpp" -#include "CommandNOP.hpp" -#include "ConditionFalse.hpp" -#include "ConditionTrue.hpp" -#include "ConditionTrue.hpp" +#include "rtt/scripting/CommandNOP.hpp" +#include "rtt/scripting/ConditionFalse.hpp" +#include "rtt/scripting/ConditionTrue.hpp" +#include "rtt/scripting/ConditionTrue.hpp" #include #include diff --git a/rtt/scripting/FunctionGraphBuilder.hpp b/rtt/scripting/FunctionGraphBuilder.hpp index 12ccda8c6..882ca00f7 100644 --- a/rtt/scripting/FunctionGraphBuilder.hpp +++ b/rtt/scripting/FunctionGraphBuilder.hpp @@ -38,8 +38,8 @@ #ifndef PROGRAMGRAPH_HPP #define PROGRAMGRAPH_HPP -#include "FunctionGraph.hpp" -#include "../base/DataSourceBase.hpp" +#include "rtt/scripting/FunctionGraph.hpp" +#include "rtt/base/DataSourceBase.hpp" #include // for std::pair #include diff --git a/rtt/scripting/GraphCopier.hpp b/rtt/scripting/GraphCopier.hpp index 862f7c09a..e2faa339d 100644 --- a/rtt/scripting/GraphCopier.hpp +++ b/rtt/scripting/GraphCopier.hpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "FunctionGraph.hpp" +#include "rtt/scripting/FunctionGraph.hpp" namespace { diff --git a/rtt/scripting/ParsedStateMachine.cpp b/rtt/scripting/ParsedStateMachine.cpp index 5c35f34da..95bbcae6b 100644 --- a/rtt/scripting/ParsedStateMachine.cpp +++ b/rtt/scripting/ParsedStateMachine.cpp @@ -35,15 +35,15 @@ * * ***************************************************************************/ -#include "ParsedStateMachine.hpp" -#include "../internal/DataSource.hpp" -#include "../ExecutionEngine.hpp" -#include "StateDescription.hpp" - -#include "../Service.hpp" -#include "StateMachineService.hpp" -#include "../TaskContext.hpp" -#include "../internal/mystd.hpp" +#include "rtt/scripting/ParsedStateMachine.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/ExecutionEngine.hpp" +#include "rtt/scripting/StateDescription.hpp" + +#include "rtt/Service.hpp" +#include "rtt/scripting/StateMachineService.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/internal/mystd.hpp" #include diff --git a/rtt/scripting/ParsedStateMachine.hpp b/rtt/scripting/ParsedStateMachine.hpp index ee1d9c792..5f9626a37 100644 --- a/rtt/scripting/ParsedStateMachine.hpp +++ b/rtt/scripting/ParsedStateMachine.hpp @@ -39,8 +39,8 @@ #ifndef CURRENT_INCLUDE_PARSEDSTATECONTEXT_HPP #define CURRENT_INCLUDE_PARSEDSTATECONTEXT_HPP -#include "StateMachine.hpp" -#include "../internal/DataSource.hpp" +#include "rtt/scripting/StateMachine.hpp" +#include "rtt/internal/DataSource.hpp" #include namespace RTT diff --git a/rtt/scripting/Parser.cpp b/rtt/scripting/Parser.cpp index 8b03bfe74..170a7a09d 100644 --- a/rtt/scripting/Parser.cpp +++ b/rtt/scripting/Parser.cpp @@ -35,22 +35,22 @@ * * ***************************************************************************/ -#include "parser-debug.hpp" -#include "parser-types.hpp" -#include "parse_exception.hpp" -#include "Parser.hpp" -#include "ProgramGraphParser.hpp" -#include "StateGraphParser.hpp" -#include "ConditionParser.hpp" -#include "ExpressionParser.hpp" -#include "ValueChangeParser.hpp" -#include "ProgramService.hpp" -#include "StateMachineService.hpp" -#include "../internal/DataSourceCommand.hpp" -#include "ConditionInterface.hpp" -#include "CommandComposite.hpp" -#include "../internal/GlobalEngine.hpp" -#include "ScriptParser.hpp" +#include "rtt/scripting/parser-debug.hpp" +#include "rtt/scripting/parser-types.hpp" +#include "rtt/scripting/parse_exception.hpp" +#include "rtt/scripting/Parser.hpp" +#include "rtt/scripting/ProgramGraphParser.hpp" +#include "rtt/scripting/StateGraphParser.hpp" +#include "rtt/scripting/ConditionParser.hpp" +#include "rtt/scripting/ExpressionParser.hpp" +#include "rtt/scripting/ValueChangeParser.hpp" +#include "rtt/scripting/ProgramService.hpp" +#include "rtt/scripting/StateMachineService.hpp" +#include "rtt/internal/DataSourceCommand.hpp" +#include "rtt/scripting/ConditionInterface.hpp" +#include "rtt/scripting/CommandComposite.hpp" +#include "rtt/internal/GlobalEngine.hpp" +#include "rtt/scripting/ScriptParser.hpp" #include #include diff --git a/rtt/scripting/Parser.hpp b/rtt/scripting/Parser.hpp index 81a40cd9b..961ea0c24 100644 --- a/rtt/scripting/Parser.hpp +++ b/rtt/scripting/Parser.hpp @@ -44,12 +44,12 @@ #include #include #include -#include "parse_exception.hpp" -#include "../internal/DataSource.hpp" -#include "ProgramInterface.hpp" -#include "ParsedStateMachine.hpp" -#include "rtt-scripting-config.h" -#include "rtt-scripting-fwd.hpp" +#include "rtt/scripting/parse_exception.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/scripting/ProgramInterface.hpp" +#include "rtt/scripting/ParsedStateMachine.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/scripting/rtt-scripting-fwd.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/PeerParser.cpp b/rtt/scripting/PeerParser.cpp index 564f0d9b6..9784720e3 100644 --- a/rtt/scripting/PeerParser.cpp +++ b/rtt/scripting/PeerParser.cpp @@ -37,12 +37,12 @@ -#include "PeerParser.hpp" -#include "parser-debug.hpp" -#include "parse_exception.hpp" -#include "../TaskContext.hpp" -#include "parser-types.hpp" -#include "../internal/GlobalService.hpp" +#include "rtt/scripting/PeerParser.hpp" +#include "rtt/scripting/parser-debug.hpp" +#include "rtt/scripting/parse_exception.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/scripting/parser-types.hpp" +#include "rtt/internal/GlobalService.hpp" #include #include diff --git a/rtt/scripting/PeerParser.hpp b/rtt/scripting/PeerParser.hpp index d43bab0c9..2aabf3e1e 100644 --- a/rtt/scripting/PeerParser.hpp +++ b/rtt/scripting/PeerParser.hpp @@ -40,12 +40,12 @@ #ifndef ORO_PEERPARSER_HPP #define ORO_PEERPARSER_HPP -#include "parser-types.hpp" -#include "CommonParser.hpp" +#include "rtt/scripting/parser-types.hpp" +#include "rtt/scripting/CommonParser.hpp" #include #include -#include "rtt-scripting-config.h" -#include "../rtt-fwd.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/rtt-fwd.hpp" namespace RTT { diff --git a/rtt/scripting/ProgramExceptions.hpp b/rtt/scripting/ProgramExceptions.hpp index da96ffd7d..36d328872 100644 --- a/rtt/scripting/ProgramExceptions.hpp +++ b/rtt/scripting/ProgramExceptions.hpp @@ -41,7 +41,7 @@ #include #include -#include "rtt-scripting-config.h" +#include "rtt/scripting/rtt-scripting-config.h" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ProgramGraphParser.cpp b/rtt/scripting/ProgramGraphParser.cpp index bb3d03a9b..ef689e53b 100644 --- a/rtt/scripting/ProgramGraphParser.cpp +++ b/rtt/scripting/ProgramGraphParser.cpp @@ -35,36 +35,36 @@ * * ***************************************************************************/ -#include "parser-debug.hpp" -#include "parse_exception.hpp" -#include "ProgramGraphParser.hpp" -#include "ArgumentsParser.hpp" - -#include "CommandNOP.hpp" -#include "CommandDataSource.hpp" -#include "ConditionTrue.hpp" -#include "../Logger.hpp" -#include "DataSourceCondition.hpp" - -#include "ConditionComposite.hpp" -#include "ConditionFalse.hpp" -#include "ConditionOnce.hpp" -#include "CommandComposite.hpp" -#include "CommandBinary.hpp" - -#include "TryCommand.hpp" -#include "FunctionFactory.hpp" -#include "../TaskContext.hpp" -#include "../internal/GlobalService.hpp" +#include "rtt/scripting/parser-debug.hpp" +#include "rtt/scripting/parse_exception.hpp" +#include "rtt/scripting/ProgramGraphParser.hpp" +#include "rtt/scripting/ArgumentsParser.hpp" + +#include "rtt/scripting/CommandNOP.hpp" +#include "rtt/scripting/CommandDataSource.hpp" +#include "rtt/scripting/ConditionTrue.hpp" +#include "rtt/Logger.hpp" +#include "rtt/scripting/DataSourceCondition.hpp" + +#include "rtt/scripting/ConditionComposite.hpp" +#include "rtt/scripting/ConditionFalse.hpp" +#include "rtt/scripting/ConditionOnce.hpp" +#include "rtt/scripting/CommandComposite.hpp" +#include "rtt/scripting/CommandBinary.hpp" + +#include "rtt/scripting/TryCommand.hpp" +#include "rtt/scripting/FunctionFactory.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/internal/GlobalService.hpp" #include #include #include -#ifdef WIN32 - #ifdef NDEBUG - #pragma optimize( "", off) - #endif +#ifdef WIN32 + #ifdef NDEBUG + #pragma optimize( "", off) + #endif #endif namespace RTT diff --git a/rtt/scripting/ProgramGraphParser.hpp b/rtt/scripting/ProgramGraphParser.hpp index 8fdaa8f23..a64ad3d96 100644 --- a/rtt/scripting/ProgramGraphParser.hpp +++ b/rtt/scripting/ProgramGraphParser.hpp @@ -38,22 +38,22 @@ #ifndef EXECUTION_PROGRAM_PARSER_HPP #define EXECUTION_PROGRAM_PARSER_HPP -#include "parser-types.hpp" +#include "rtt/scripting/parser-types.hpp" -#include "CommonParser.hpp" -#include "PeerParser.hpp" -#include "ConditionParser.hpp" -#include "ExpressionParser.hpp" -#include "../TaskContext.hpp" -#include "FunctionGraphBuilder.hpp" -#include "ValueChangeParser.hpp" +#include "rtt/scripting/CommonParser.hpp" +#include "rtt/scripting/PeerParser.hpp" +#include "rtt/scripting/ConditionParser.hpp" +#include "rtt/scripting/ExpressionParser.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/scripting/FunctionGraphBuilder.hpp" +#include "rtt/scripting/ValueChangeParser.hpp" #include #include #include -#include "ProgramService.hpp" +#include "rtt/scripting/ProgramService.hpp" //namespace RTT { // class ProgramService; //} diff --git a/rtt/scripting/ProgramGraphParser2.cpp b/rtt/scripting/ProgramGraphParser2.cpp index ed9b2bff1..da8522fb1 100644 --- a/rtt/scripting/ProgramGraphParser2.cpp +++ b/rtt/scripting/ProgramGraphParser2.cpp @@ -35,9 +35,9 @@ * * ***************************************************************************/ -#include "parser-debug.hpp" -#include "parse_exception.hpp" -#include "ProgramGraphParser.hpp" +#include "rtt/scripting/parser-debug.hpp" +#include "rtt/scripting/parse_exception.hpp" +#include "rtt/scripting/ProgramGraphParser.hpp" #include #include diff --git a/rtt/scripting/ProgramInterface.cpp b/rtt/scripting/ProgramInterface.cpp index ecfe1c3e0..f608cdce3 100644 --- a/rtt/scripting/ProgramInterface.cpp +++ b/rtt/scripting/ProgramInterface.cpp @@ -37,8 +37,8 @@ -#include "ProgramInterface.hpp" -#include +#include "rtt/scripting/ProgramInterface.hpp" +#include "rtt/Logger.hpp" namespace RTT { using namespace detail; diff --git a/rtt/scripting/ProgramInterface.hpp b/rtt/scripting/ProgramInterface.hpp index 6ac8e61a9..22c0d18a7 100644 --- a/rtt/scripting/ProgramInterface.hpp +++ b/rtt/scripting/ProgramInterface.hpp @@ -41,12 +41,12 @@ #include #include #include -#include "../base/DataSourceBase.hpp" -#include "../base/AttributeBase.hpp" -#include "../base/ExecutableInterface.hpp" -#include "rtt-scripting-config.h" -#include "../rtt-fwd.hpp" -#include "rtt-scripting-fwd.hpp" +#include "rtt/base/DataSourceBase.hpp" +#include "rtt/base/AttributeBase.hpp" +#include "rtt/base/ExecutableInterface.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/rtt-fwd.hpp" +#include "rtt/scripting/rtt-scripting-fwd.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ProgramService.cpp b/rtt/scripting/ProgramService.cpp index 514128a28..6f8a5a987 100644 --- a/rtt/scripting/ProgramService.cpp +++ b/rtt/scripting/ProgramService.cpp @@ -37,12 +37,12 @@ -#include "ProgramService.hpp" +#include "rtt/scripting/ProgramService.hpp" -#include "../OperationCaller.hpp" -#include "../FactoryExceptions.hpp" -#include "../ExecutionEngine.hpp" -#include "../internal/DataSources.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/FactoryExceptions.hpp" +#include "rtt/ExecutionEngine.hpp" +#include "rtt/internal/DataSources.hpp" namespace RTT { diff --git a/rtt/scripting/ProgramService.hpp b/rtt/scripting/ProgramService.hpp index 8576abb91..31c90861b 100644 --- a/rtt/scripting/ProgramService.hpp +++ b/rtt/scripting/ProgramService.hpp @@ -40,9 +40,9 @@ #ifndef PROGRAM_SERVICE_HPP #define PROGRAM_SERVICE_HPP -#include "../Service.hpp" -#include "FunctionGraph.hpp" -#include "../internal/DataSources.hpp" +#include "rtt/Service.hpp" +#include "rtt/scripting/FunctionGraph.hpp" +#include "rtt/internal/DataSources.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/PropertyParser.cpp b/rtt/scripting/PropertyParser.cpp index 2d4c9448e..f4944bc58 100644 --- a/rtt/scripting/PropertyParser.cpp +++ b/rtt/scripting/PropertyParser.cpp @@ -37,14 +37,14 @@ -#include "PropertyParser.hpp" -#include "parser-debug.hpp" -#include "parse_exception.hpp" -#include "../TaskContext.hpp" -#include "parser-types.hpp" - -#include -#include +#include "rtt/scripting/PropertyParser.hpp" +#include "rtt/scripting/parser-debug.hpp" +#include "rtt/scripting/parse_exception.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/scripting/parser-types.hpp" + +#include "rtt/Property.hpp" +#include "rtt/PropertyBag.hpp" #include namespace RTT diff --git a/rtt/scripting/PropertyParser.hpp b/rtt/scripting/PropertyParser.hpp index d13337134..ff50f3f26 100644 --- a/rtt/scripting/PropertyParser.hpp +++ b/rtt/scripting/PropertyParser.hpp @@ -40,9 +40,9 @@ #ifndef ORO_PROPERTYPARSER_HPP #define ORO_PROPERTYPARSER_HPP -#include "parser-types.hpp" -#include "../rtt-fwd.hpp" -#include "CommonParser.hpp" +#include "rtt/scripting/parser-types.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/scripting/CommonParser.hpp" #include namespace RTT diff --git a/rtt/scripting/ScriptParser.cpp b/rtt/scripting/ScriptParser.cpp index c03ee8864..281fd3974 100644 --- a/rtt/scripting/ScriptParser.cpp +++ b/rtt/scripting/ScriptParser.cpp @@ -36,15 +36,15 @@ ***************************************************************************/ -#include "parser-debug.hpp" -#include "parse_exception.hpp" -#include "ScriptParser.hpp" -#include "CommonParser.hpp" -#include "StateGraphParser.hpp" -#include "ProgramGraphParser.hpp" -#include "../TaskContext.hpp" -#include "../internal/Exceptions.hpp" -#include "ScriptingService.hpp" +#include "rtt/scripting/parser-debug.hpp" +#include "rtt/scripting/parse_exception.hpp" +#include "rtt/scripting/ScriptParser.hpp" +#include "rtt/scripting/CommonParser.hpp" +#include "rtt/scripting/StateGraphParser.hpp" +#include "rtt/scripting/ProgramGraphParser.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/internal/Exceptions.hpp" +#include "rtt/scripting/ScriptingService.hpp" #include #include @@ -54,9 +54,9 @@ #include #include #include -#include "../internal/mystd.hpp" -#include "../internal/GlobalEngine.hpp" -#include "ParsedStateMachine.hpp" +#include "rtt/internal/mystd.hpp" +#include "rtt/internal/GlobalEngine.hpp" +#include "rtt/scripting/ParsedStateMachine.hpp" namespace RTT { diff --git a/rtt/scripting/ScriptParser.hpp b/rtt/scripting/ScriptParser.hpp index 5ae5b8057..6ddffd06e 100644 --- a/rtt/scripting/ScriptParser.hpp +++ b/rtt/scripting/ScriptParser.hpp @@ -39,14 +39,14 @@ #ifndef RTT_SCRIPTING_PARSER_HPP #define RTT_SCRIPTING_PARSER_HPP -#include "parser-types.hpp" +#include "rtt/scripting/parser-types.hpp" #include #include #include #include -#include "../internal/DataSource.hpp" -#include "../Service.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/Service.hpp" namespace RTT { diff --git a/rtt/scripting/Scripting.cpp b/rtt/scripting/Scripting.cpp index 3dbcd1ba5..da5656f6b 100644 --- a/rtt/scripting/Scripting.cpp +++ b/rtt/scripting/Scripting.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "Scripting.hpp" +#include "rtt/scripting/Scripting.hpp" namespace RTT { diff --git a/rtt/scripting/Scripting.hpp b/rtt/scripting/Scripting.hpp index bc10835f3..a7385e6cd 100644 --- a/rtt/scripting/Scripting.hpp +++ b/rtt/scripting/Scripting.hpp @@ -39,10 +39,10 @@ #ifndef ORO_SCRIPTING_HPP_ #define ORO_SCRIPTING_HPP_ -#include "../ServiceRequester.hpp" -#include "ProgramInterface.hpp" -#include "StateMachine.hpp" -#include "../OperationCaller.hpp" +#include "rtt/ServiceRequester.hpp" +#include "rtt/scripting/ProgramInterface.hpp" +#include "rtt/scripting/StateMachine.hpp" +#include "rtt/OperationCaller.hpp" #include namespace RTT diff --git a/rtt/scripting/ScriptingService.cpp b/rtt/scripting/ScriptingService.cpp index a1ab2f11f..b83d2c3b4 100644 --- a/rtt/scripting/ScriptingService.cpp +++ b/rtt/scripting/ScriptingService.cpp @@ -37,23 +37,23 @@ -#include "ScriptingService.hpp" -#include "../Logger.hpp" -#include "../TaskContext.hpp" +#include "rtt/scripting/ScriptingService.hpp" +#include "rtt/Logger.hpp" +#include "rtt/TaskContext.hpp" #include #include #include #include -#include "scripting/rtt-scripting-config.h" -#include "ProgramExceptions.hpp" -#include "StatementProcessor.hpp" -#include "../Service.hpp" -#include "Parser.hpp" -#include "parse_exception.hpp" -#include "../OperationCaller.hpp" -#include "../internal/mystd.hpp" -#include "../plugin/ServicePlugin.hpp" -#include "../internal/GlobalEngine.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/scripting/ProgramExceptions.hpp" +#include "rtt/scripting/StatementProcessor.hpp" +#include "rtt/Service.hpp" +#include "rtt/scripting/Parser.hpp" +#include "rtt/scripting/parse_exception.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/internal/mystd.hpp" +#include "rtt/plugin/ServicePlugin.hpp" +#include "rtt/internal/GlobalEngine.hpp" ORO_SERVICE_NAMED_PLUGIN( RTT::scripting::ScriptingService, "scripting" ) diff --git a/rtt/scripting/ScriptingService.hpp b/rtt/scripting/ScriptingService.hpp index 02c48d37d..3b4b7c1bf 100644 --- a/rtt/scripting/ScriptingService.hpp +++ b/rtt/scripting/ScriptingService.hpp @@ -42,11 +42,11 @@ #include #include #include -#include "rtt-scripting-config.h" -#include "ProgramInterface.hpp" -#include "StateMachine.hpp" -#include "../Service.hpp" -#include "ProgramExceptions.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/scripting/ProgramInterface.hpp" +#include "rtt/scripting/StateMachine.hpp" +#include "rtt/Service.hpp" +#include "rtt/scripting/ProgramExceptions.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/SendHandleAlias.cpp b/rtt/scripting/SendHandleAlias.cpp index 679524a82..aa1a60f32 100644 --- a/rtt/scripting/SendHandleAlias.cpp +++ b/rtt/scripting/SendHandleAlias.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "SendHandleAlias.hpp" +#include "rtt/scripting/SendHandleAlias.hpp" namespace RTT { diff --git a/rtt/scripting/SendHandleAlias.hpp b/rtt/scripting/SendHandleAlias.hpp index 310a259d8..58dd976f4 100644 --- a/rtt/scripting/SendHandleAlias.hpp +++ b/rtt/scripting/SendHandleAlias.hpp @@ -39,9 +39,9 @@ #ifndef ORO_SENDHANDLEALIAS_HPP_ #define ORO_SENDHANDLEALIAS_HPP_ -#include "../base/AttributeBase.hpp" -#include "../OperationInterface.hpp" -#include "../rtt-fwd.hpp" +#include "rtt/base/AttributeBase.hpp" +#include "rtt/OperationInterface.hpp" +#include "rtt/rtt-fwd.hpp" namespace RTT { diff --git a/rtt/scripting/StateDescription.cpp b/rtt/scripting/StateDescription.cpp index 741ee39fa..f869fcedc 100644 --- a/rtt/scripting/StateDescription.cpp +++ b/rtt/scripting/StateDescription.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "StateDescription.hpp" +#include "rtt/scripting/StateDescription.hpp" namespace RTT { using namespace detail; diff --git a/rtt/scripting/StateDescription.hpp b/rtt/scripting/StateDescription.hpp index 2542f6ed5..04976c07e 100644 --- a/rtt/scripting/StateDescription.hpp +++ b/rtt/scripting/StateDescription.hpp @@ -38,8 +38,8 @@ #ifndef STATE_DESCRIPTION_HPP #define STATE_DESCRIPTION_HPP -#include "StateInterface.hpp" -#include "ProgramInterface.hpp" +#include "rtt/scripting/StateInterface.hpp" +#include "rtt/scripting/ProgramInterface.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/StateGraphParser.cpp b/rtt/scripting/StateGraphParser.cpp index 0553b76ae..b1cf3c3c7 100644 --- a/rtt/scripting/StateGraphParser.cpp +++ b/rtt/scripting/StateGraphParser.cpp @@ -35,30 +35,30 @@ * * ***************************************************************************/ -#include "parser-debug.hpp" -#include "parse_exception.hpp" -#include "StateGraphParser.hpp" -#include "CommonParser.hpp" -#include "ConditionParser.hpp" -#include "ConditionCompare.hpp" -#include "ConditionComposite.hpp" -#include "ConditionCache.hpp" -#include "ConditionBoolDataSource.hpp" -#include "ValueChangeParser.hpp" -#include "ProgramGraphParser.hpp" -#include "PeerParser.hpp" -#include "ArgumentsParser.hpp" -#include "StateMachineBuilder.hpp" -#include "../TaskContext.hpp" -#include "StateMachineService.hpp" - -#include "CommandComposite.hpp" -#include "../internal/Exceptions.hpp" -#include "../base/AttributeBase.hpp" -#include "ConditionTrue.hpp" -#include "ConditionInvert.hpp" -#include "StateDescription.hpp" -#include "ParsedStateMachine.hpp" +#include "rtt/scripting/parser-debug.hpp" +#include "rtt/scripting/parse_exception.hpp" +#include "rtt/scripting/StateGraphParser.hpp" +#include "rtt/scripting/CommonParser.hpp" +#include "rtt/scripting/ConditionParser.hpp" +#include "rtt/scripting/ConditionCompare.hpp" +#include "rtt/scripting/ConditionComposite.hpp" +#include "rtt/scripting/ConditionCache.hpp" +#include "rtt/scripting/ConditionBoolDataSource.hpp" +#include "rtt/scripting/ValueChangeParser.hpp" +#include "rtt/scripting/ProgramGraphParser.hpp" +#include "rtt/scripting/PeerParser.hpp" +#include "rtt/scripting/ArgumentsParser.hpp" +#include "rtt/scripting/StateMachineBuilder.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/scripting/StateMachineService.hpp" + +#include "rtt/scripting/CommandComposite.hpp" +#include "rtt/internal/Exceptions.hpp" +#include "rtt/base/AttributeBase.hpp" +#include "rtt/scripting/ConditionTrue.hpp" +#include "rtt/scripting/ConditionInvert.hpp" +#include "rtt/scripting/StateDescription.hpp" +#include "rtt/scripting/ParsedStateMachine.hpp" #include #include @@ -68,7 +68,7 @@ #include #include #include -#include "../internal/mystd.hpp" +#include "rtt/internal/mystd.hpp" namespace RTT { diff --git a/rtt/scripting/StateGraphParser.hpp b/rtt/scripting/StateGraphParser.hpp index 31cceb2ba..466e7a4de 100644 --- a/rtt/scripting/StateGraphParser.hpp +++ b/rtt/scripting/StateGraphParser.hpp @@ -38,13 +38,13 @@ #ifndef EXECUTION_STATE_PARSER_HPP #define EXECUTION_STATE_PARSER_HPP -#include "parser-types.hpp" +#include "rtt/scripting/parser-types.hpp" #include #include #include #include -#include "../internal/DataSource.hpp" +#include "rtt/internal/DataSource.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/StateInterface.cpp b/rtt/scripting/StateInterface.cpp index b72232fbd..32b3cf525 100644 --- a/rtt/scripting/StateInterface.cpp +++ b/rtt/scripting/StateInterface.cpp @@ -43,7 +43,7 @@ * Author: kaltan */ -#include "StateInterface.hpp" +#include "rtt/scripting/StateInterface.hpp" using namespace RTT; using namespace RTT::detail; diff --git a/rtt/scripting/StateInterface.hpp b/rtt/scripting/StateInterface.hpp index 03b7131dd..cdd62b620 100644 --- a/rtt/scripting/StateInterface.hpp +++ b/rtt/scripting/StateInterface.hpp @@ -45,9 +45,9 @@ #endif #include -#include "../rtt-fwd.hpp" -#include "ProgramInterface.hpp" -#include "../base/DataSourceBase.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/scripting/ProgramInterface.hpp" +#include "rtt/base/DataSourceBase.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/StateMachine.cpp b/rtt/scripting/StateMachine.cpp index a8315247e..5ab635e83 100644 --- a/rtt/scripting/StateMachine.cpp +++ b/rtt/scripting/StateMachine.cpp @@ -34,18 +34,18 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "StateMachine.hpp" -#include "../ExecutionEngine.hpp" -#include "../internal/DataSource.hpp" -#include "../Service.hpp" -#include "CommandFunctors.hpp" -#include +#include "rtt/scripting/StateMachine.hpp" +#include "rtt/ExecutionEngine.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/Service.hpp" +#include "rtt/scripting/CommandFunctors.hpp" +#include "rtt/Logger.hpp" #include #include #include #include -#include "internal/mystd.hpp" +#include "rtt/internal/mystd.hpp" #define TRACE(msg) do { \ if (!mtrace) \ diff --git a/rtt/scripting/StateMachine.hpp b/rtt/scripting/StateMachine.hpp index 80beac9ab..0f9b181e7 100644 --- a/rtt/scripting/StateMachine.hpp +++ b/rtt/scripting/StateMachine.hpp @@ -39,14 +39,14 @@ #ifndef HIERARCHICAL_STATE_MACHINE_HPP #define HIERARCHICAL_STATE_MACHINE_HPP -#include "rtt-scripting-config.h" -#include "StateInterface.hpp" -#include "ConditionInterface.hpp" -#include "../base/ActionInterface.hpp" -#include "../base/ExecutableInterface.hpp" -#include "../base/DataSourceBase.hpp" -#include "../Handle.hpp" -#include "../os/Mutex.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/scripting/StateInterface.hpp" +#include "rtt/scripting/ConditionInterface.hpp" +#include "rtt/base/ActionInterface.hpp" +#include "rtt/base/ExecutableInterface.hpp" +#include "rtt/base/DataSourceBase.hpp" +#include "rtt/Handle.hpp" +#include "rtt/os/Mutex.hpp" #include #include diff --git a/rtt/scripting/StateMachineBuilder.cpp b/rtt/scripting/StateMachineBuilder.cpp index f07f2901f..ade175262 100644 --- a/rtt/scripting/StateMachineBuilder.cpp +++ b/rtt/scripting/StateMachineBuilder.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "StateMachineBuilder.hpp" -#include "ParsedStateMachine.hpp" +#include "rtt/scripting/StateMachineBuilder.hpp" +#include "rtt/scripting/ParsedStateMachine.hpp" #include namespace RTT { diff --git a/rtt/scripting/StateMachineBuilder.hpp b/rtt/scripting/StateMachineBuilder.hpp index 64d0f581f..3f4f23be4 100644 --- a/rtt/scripting/StateMachineBuilder.hpp +++ b/rtt/scripting/StateMachineBuilder.hpp @@ -37,7 +37,7 @@ #include #include -#include "ParsedStateMachine.hpp" +#include "rtt/scripting/ParsedStateMachine.hpp" namespace RTT { diff --git a/rtt/scripting/StateMachineService.cpp b/rtt/scripting/StateMachineService.cpp index dd772a3eb..bb4c640f8 100644 --- a/rtt/scripting/StateMachineService.cpp +++ b/rtt/scripting/StateMachineService.cpp @@ -37,12 +37,12 @@ -#include "StateMachineService.hpp" +#include "rtt/scripting/StateMachineService.hpp" -#include "../Attribute.hpp" -#include "../FactoryExceptions.hpp" -#include "../TaskContext.hpp" -#include "../OperationCaller.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/FactoryExceptions.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" namespace RTT { diff --git a/rtt/scripting/StateMachineService.hpp b/rtt/scripting/StateMachineService.hpp index 1cfb2bf9a..bf15e15cb 100644 --- a/rtt/scripting/StateMachineService.hpp +++ b/rtt/scripting/StateMachineService.hpp @@ -40,8 +40,8 @@ #ifndef STATEMACHINE_SERVICE_HPP #define STATEMACHINE_SERVICE_HPP -#include "../Service.hpp" -#include "ParsedStateMachine.hpp" +#include "rtt/Service.hpp" +#include "rtt/scripting/ParsedStateMachine.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/StatementProcessor.cpp b/rtt/scripting/StatementProcessor.cpp index 19d99e84f..003361b7a 100644 --- a/rtt/scripting/StatementProcessor.cpp +++ b/rtt/scripting/StatementProcessor.cpp @@ -37,13 +37,13 @@ -#include "StatementProcessor.hpp" -#include "Parser.hpp" -#include "parse_exception.hpp" +#include "rtt/scripting/StatementProcessor.hpp" +#include "rtt/scripting/Parser.hpp" +#include "rtt/scripting/parse_exception.hpp" -#include "../TaskContext.hpp" -#include "../types/TypeStream.hpp" -#include "../Logger.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/types/TypeStream.hpp" +#include "rtt/Logger.hpp" #include #include diff --git a/rtt/scripting/StatementProcessor.hpp b/rtt/scripting/StatementProcessor.hpp index 08c4fad4f..6989f4a8e 100644 --- a/rtt/scripting/StatementProcessor.hpp +++ b/rtt/scripting/StatementProcessor.hpp @@ -40,8 +40,8 @@ #define ORO_EXECUTION_STATEMENT_PROCESSOR_HPP #include -#include "rtt-scripting-config.h" -#include "../rtt-fwd.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/rtt-fwd.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/TryCommand.cpp b/rtt/scripting/TryCommand.cpp index 54e83eed4..aeadf7991 100644 --- a/rtt/scripting/TryCommand.cpp +++ b/rtt/scripting/TryCommand.cpp @@ -36,9 +36,9 @@ ***************************************************************************/ -#include -#include "TryCommand.hpp" -#include "../internal/DataSources.hpp" +#include "rtt/Logger.hpp" +#include "rtt/scripting/TryCommand.hpp" +#include "rtt/internal/DataSources.hpp" namespace RTT { diff --git a/rtt/scripting/TryCommand.hpp b/rtt/scripting/TryCommand.hpp index 258b5984c..641cf0912 100644 --- a/rtt/scripting/TryCommand.hpp +++ b/rtt/scripting/TryCommand.hpp @@ -39,11 +39,11 @@ #ifndef ORO_TRY_COMMAND_HPP #define ORO_TRY_COMMAND_HPP -#include "rtt-scripting-config.h" -#include "../base/ActionInterface.hpp" -#include "ConditionInterface.hpp" -#include "../Logger.hpp" -#include "../internal/DataSource.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/base/ActionInterface.hpp" +#include "rtt/scripting/ConditionInterface.hpp" +#include "rtt/Logger.hpp" +#include "rtt/internal/DataSource.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ValueChangeParser.cpp b/rtt/scripting/ValueChangeParser.cpp index 82162b225..23461858c 100644 --- a/rtt/scripting/ValueChangeParser.cpp +++ b/rtt/scripting/ValueChangeParser.cpp @@ -35,22 +35,22 @@ * * ***************************************************************************/ -#include "parser-debug.hpp" -#include "parse_exception.hpp" -#include "ValueChangeParser.hpp" - -#include "../Service.hpp" -#include "../types/Types.hpp" -#include "../Attribute.hpp" -#include "../TaskContext.hpp" -#include "../types/GlobalsRepository.hpp" +#include "rtt/scripting/parser-debug.hpp" +#include "rtt/scripting/parse_exception.hpp" +#include "rtt/scripting/ValueChangeParser.hpp" + +#include "rtt/Service.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/types/GlobalsRepository.hpp" //#include "DumpObject.hpp" #include #include #include -#include +#include "rtt/Logger.hpp" #include #include diff --git a/rtt/scripting/ValueChangeParser.hpp b/rtt/scripting/ValueChangeParser.hpp index 5d368faa3..2e57ee6d0 100644 --- a/rtt/scripting/ValueChangeParser.hpp +++ b/rtt/scripting/ValueChangeParser.hpp @@ -38,15 +38,15 @@ #ifndef VALUECHANGEPARSER_HPP #define VALUECHANGEPARSER_HPP -#include "parser-types.hpp" - -#include "../Attribute.hpp" -#include "CommonParser.hpp" -#include "ExpressionParser.hpp" -#include "PeerParser.hpp" -#include "PropertyParser.hpp" -#include "../types/Types.hpp" -#include "../Service.hpp" +#include "rtt/scripting/parser-types.hpp" + +#include "rtt/Attribute.hpp" +#include "rtt/scripting/CommonParser.hpp" +#include "rtt/scripting/ExpressionParser.hpp" +#include "rtt/scripting/PeerParser.hpp" +#include "rtt/scripting/PropertyParser.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/Service.hpp" namespace RTT { namespace scripting { diff --git a/rtt/scripting/ValueParser.cpp b/rtt/scripting/ValueParser.cpp index 5164171d3..52d29607b 100644 --- a/rtt/scripting/ValueParser.cpp +++ b/rtt/scripting/ValueParser.cpp @@ -35,14 +35,14 @@ * * ***************************************************************************/ -#include "parser-debug.hpp" -#include "parse_exception.hpp" -#include "ValueParser.hpp" -#include "../Attribute.hpp" - -#include "../TaskContext.hpp" -#include "../Service.hpp" -#include "../types/GlobalsRepository.hpp" +#include "rtt/scripting/parser-debug.hpp" +#include "rtt/scripting/parse_exception.hpp" +#include "rtt/scripting/ValueParser.hpp" +#include "rtt/Attribute.hpp" + +#include "rtt/TaskContext.hpp" +#include "rtt/Service.hpp" +#include "rtt/types/GlobalsRepository.hpp" #include #include diff --git a/rtt/scripting/ValueParser.hpp b/rtt/scripting/ValueParser.hpp index 54d356057..c10e1ce8c 100644 --- a/rtt/scripting/ValueParser.hpp +++ b/rtt/scripting/ValueParser.hpp @@ -38,11 +38,11 @@ #ifndef VALUEPARSER_HPP #define VALUEPARSER_HPP -#include "parser-types.hpp" -#include "CommonParser.hpp" -#include "PeerParser.hpp" -#include "PropertyParser.hpp" -#include "../ConfigurationInterface.hpp" +#include "rtt/scripting/parser-types.hpp" +#include "rtt/scripting/CommonParser.hpp" +#include "rtt/scripting/PeerParser.hpp" +#include "rtt/scripting/PropertyParser.hpp" +#include "rtt/ConfigurationInterface.hpp" #include #include diff --git a/rtt/scripting/VertexNode.cpp b/rtt/scripting/VertexNode.cpp index 320bead6f..327c4a931 100644 --- a/rtt/scripting/VertexNode.cpp +++ b/rtt/scripting/VertexNode.cpp @@ -34,10 +34,10 @@ * Suite 330, Boston, MA 02111-1307 USA * * * ***************************************************************************/ -#include "VertexNode.hpp" -#include "CommandNOP.hpp" -#include "../base/ActionInterface.hpp" -#include "../internal/DataSource.hpp" +#include "rtt/scripting/VertexNode.hpp" +#include "rtt/scripting/CommandNOP.hpp" +#include "rtt/base/ActionInterface.hpp" +#include "rtt/internal/DataSource.hpp" namespace RTT { using namespace detail; diff --git a/rtt/scripting/VertexNode.hpp b/rtt/scripting/VertexNode.hpp index 0a768b61c..2bd85fdf1 100644 --- a/rtt/scripting/VertexNode.hpp +++ b/rtt/scripting/VertexNode.hpp @@ -38,9 +38,9 @@ #ifndef VERTEXNODE_HPP #define VERTEXNODE_HPP -#include "rtt-scripting-config.h" +#include "rtt/scripting/rtt-scripting-config.h" #include -#include "../base/ActionInterface.hpp" +#include "rtt/base/ActionInterface.hpp" // adjacency_list has some very short template parameter names, // which may be defined as macros on some OS's. So undef here. diff --git a/rtt/scripting/parse_exception.cpp b/rtt/scripting/parse_exception.cpp index 5ecd2e00d..d14dca194 100644 --- a/rtt/scripting/parse_exception.cpp +++ b/rtt/scripting/parse_exception.cpp @@ -38,7 +38,7 @@ #ifdef ORO_PRAGMA_INTERFACE #pragma implementation #endif -#include "parse_exception.hpp" +#include "rtt/scripting/parse_exception.hpp" #include diff --git a/rtt/scripting/parse_exception.hpp b/rtt/scripting/parse_exception.hpp index 642d3911d..e55f2ab3f 100644 --- a/rtt/scripting/parse_exception.hpp +++ b/rtt/scripting/parse_exception.hpp @@ -39,8 +39,8 @@ #include #include -#include "rtt-scripting-config.h" -#include "../base/DataSourceBase.hpp" +#include "rtt/scripting/rtt-scripting-config.h" +#include "rtt/base/DataSourceBase.hpp" #ifdef ORO_PRAGMA_INTERFACE #pragma interface diff --git a/rtt/scripting/parser-types.hpp b/rtt/scripting/parser-types.hpp index 0101c8f76..4f97cde11 100644 --- a/rtt/scripting/parser-types.hpp +++ b/rtt/scripting/parser-types.hpp @@ -37,7 +37,7 @@ #ifndef PARSER_TYPES_HPP #define PARSER_TYPES_HPP -#include "rtt-scripting-config.h" +#include "rtt/scripting/rtt-scripting-config.h" #include @@ -49,8 +49,8 @@ namespace boost_spirit = boost::spirit::classic; #include namespace boost_spirit = boost::spirit; #endif -#include "../base/ActionInterface.hpp" -#include "rtt-scripting-fwd.hpp" +#include "rtt/base/ActionInterface.hpp" +#include "rtt/scripting/rtt-scripting-fwd.hpp" #undef interface // To avoid name clash with namespace interface and Windows SDK objbase.h included through boost/spirit @@ -131,8 +131,8 @@ namespace RTT // here are the typedef's for the scanner, and the rule types.. //typedef __typeof__ ( SKIP_PARSER ) skip_parser_t; - - //register SKIP_PARSER with typeof system + + //register SKIP_PARSER with typeof system //struct X {}; //BOOST_TYPEOF_REGISTER_TYPE(X); //TODO: diff --git a/rtt/scripting/rtt-scripting-config.h.in b/rtt/scripting/rtt-scripting-config.h.in index ff31585fd..0e07f1edc 100644 --- a/rtt/scripting/rtt-scripting-config.h.in +++ b/rtt/scripting/rtt-scripting-config.h.in @@ -40,7 +40,7 @@ #ifndef RTT_SCRIPTING_CONFIG_H #define RTT_SCRIPTING_CONFIG_H -#include "../rtt-config.h" +#include "rtt/rtt-config.h" // // See: @@ -70,11 +70,11 @@ # if defined(RTT_SCRIPTING_DLL_EXPORT) # define RTT_SCRIPTING_API __declspec(dllexport) # define RTT_SCRIPTING_EXPORT __declspec(dllexport) -# define RTT_SCRIPTING_HIDE +# define RTT_SCRIPTING_HIDE # else # define RTT_SCRIPTING_API __declspec(dllimport) # define RTT_SCRIPTING_EXPORT __declspec(dllexport) -# define RTT_SCRIPTING_HIDE +# define RTT_SCRIPTING_HIDE # endif # else # define RTT_SCRIPTING_API diff --git a/rtt/transports/corba/AnyDataSource.cpp b/rtt/transports/corba/AnyDataSource.cpp index 2f7be5e11..6dbb464ef 100644 --- a/rtt/transports/corba/AnyDataSource.cpp +++ b/rtt/transports/corba/AnyDataSource.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "AnyDataSource.hpp" -#include "CorbaLib.hpp" +#include "rtt/transports/corba/AnyDataSource.hpp" +#include "rtt/transports/corba/CorbaLib.hpp" namespace RTT { using namespace detail; diff --git a/rtt/transports/corba/AnyDataSource.hpp b/rtt/transports/corba/AnyDataSource.hpp index 6a3c9eb31..3b9c5a35d 100644 --- a/rtt/transports/corba/AnyDataSource.hpp +++ b/rtt/transports/corba/AnyDataSource.hpp @@ -40,7 +40,7 @@ #define ORO_CORBA_ANYDATASOURCE_HPP -#include "corba.h" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO #include #if TAO_MAJOR_VERSION == 1 && TAO_MINOR_VERSION <= 4 @@ -50,7 +50,7 @@ #endif #endif -#include "../../internal/DataSource.hpp" +#include "rtt/internal/DataSource.hpp" namespace RTT { diff --git a/rtt/transports/corba/ApplicationServer.cpp b/rtt/transports/corba/ApplicationServer.cpp index bda42482a..45ad5a88e 100644 --- a/rtt/transports/corba/ApplicationServer.cpp +++ b/rtt/transports/corba/ApplicationServer.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "ApplicationServer.hpp" -#include "../../Logger.hpp" +#include "rtt/transports/corba/ApplicationServer.hpp" +#include "rtt/Logger.hpp" #if defined( CORBA_IS_TAO ) && defined( CORBA_TAO_HAS_MESSAGING ) #include diff --git a/rtt/transports/corba/ApplicationServer.hpp b/rtt/transports/corba/ApplicationServer.hpp index d683e254f..285faf08c 100644 --- a/rtt/transports/corba/ApplicationServer.hpp +++ b/rtt/transports/corba/ApplicationServer.hpp @@ -39,13 +39,13 @@ #ifndef ORO_APPLICATION_SERVER_HPP #define ORO_APPLICATION_SERVER_HPP -#include "corba.h" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO #include #else #include #endif -#include "../../Time.hpp" +#include "rtt/Time.hpp" namespace RTT {namespace corba diff --git a/rtt/transports/corba/ConfigurationInterfaceI.cpp b/rtt/transports/corba/ConfigurationInterfaceI.cpp index 1cb399970..44c299ff9 100644 --- a/rtt/transports/corba/ConfigurationInterfaceI.cpp +++ b/rtt/transports/corba/ConfigurationInterfaceI.cpp @@ -66,14 +66,14 @@ // TAO_IDL - Generated from // ../../../ACE_wrappers/TAO/TAO_IDL/be/be_codegen.cpp:1196 -#include "ConfigurationInterfaceI.h" +#include "rtt/transports/corba/ConfigurationInterfaceI.h" #include "ConfigurationInterfaceC.h" -#include "CorbaLib.hpp" -#include "CorbaTypeTransporter.hpp" +#include "rtt/transports/corba/CorbaLib.hpp" +#include "rtt/transports/corba/CorbaTypeTransporter.hpp" #include -#include "../../PropertyBag.hpp" -#include "../../Property.hpp" -#include "../../rtt-detail-fwd.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/Property.hpp" +#include "rtt/rtt-detail-fwd.hpp" using namespace RTT; using namespace RTT::detail; diff --git a/rtt/transports/corba/ConfigurationInterfaceI.h b/rtt/transports/corba/ConfigurationInterfaceI.h index 2e604b144..0af538839 100644 --- a/rtt/transports/corba/ConfigurationInterfaceI.h +++ b/rtt/transports/corba/ConfigurationInterfaceI.h @@ -69,15 +69,15 @@ #ifndef ORO_CORBA_CONFIGURATIONINTERFACEI_H_ #define ORO_CORBA_CONFIGURATIONINTERFACEI_H_ -#include "corba.h" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO #include "ConfigurationInterfaceS.h" #else #include "ConfigurationInterfaceC.h" #endif -#include "../../ConfigurationInterface.hpp" -#include "../../PropertyBag.hpp" +#include "rtt/ConfigurationInterface.hpp" +#include "rtt/PropertyBag.hpp" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/rtt/transports/corba/CorbaConnPolicy.cpp b/rtt/transports/corba/CorbaConnPolicy.cpp index 3a67718f5..f621669ba 100644 --- a/rtt/transports/corba/CorbaConnPolicy.cpp +++ b/rtt/transports/corba/CorbaConnPolicy.cpp @@ -43,7 +43,7 @@ * Author: kaltan */ -#include "CorbaConnPolicy.hpp" +#include "rtt/transports/corba/CorbaConnPolicy.hpp" RTT::corba::CConnPolicy toCORBA(RTT::ConnPolicy const& policy) { diff --git a/rtt/transports/corba/CorbaConnPolicy.hpp b/rtt/transports/corba/CorbaConnPolicy.hpp index db9b5279e..b0c173080 100644 --- a/rtt/transports/corba/CorbaConnPolicy.hpp +++ b/rtt/transports/corba/CorbaConnPolicy.hpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "../../ConnPolicy.hpp" +#include "rtt/ConnPolicy.hpp" #include "rtt-corba-config.h" #include "DataFlowC.h" #include "rtt-corba-config.h" diff --git a/rtt/transports/corba/CorbaConversion.cpp b/rtt/transports/corba/CorbaConversion.cpp index 9565cee74..fbc6b333f 100644 --- a/rtt/transports/corba/CorbaConversion.cpp +++ b/rtt/transports/corba/CorbaConversion.cpp @@ -36,9 +36,9 @@ ***************************************************************************/ -#include "CorbaConversion.hpp" -#include "../../PropertyBag.hpp" -#include "TaskContextProxy.hpp" +#include "rtt/transports/corba/CorbaConversion.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/transports/corba/TaskContextProxy.hpp" namespace RTT { diff --git a/rtt/transports/corba/CorbaConversion.hpp b/rtt/transports/corba/CorbaConversion.hpp index a3f2942b5..685f04ab1 100644 --- a/rtt/transports/corba/CorbaConversion.hpp +++ b/rtt/transports/corba/CorbaConversion.hpp @@ -43,7 +43,7 @@ email : peter.soetens@fmtc.be #include #include -#include "corba.h" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO #include #if TAO_MAJOR_VERSION == 1 && TAO_MINOR_VERSION <= 4 @@ -53,13 +53,13 @@ email : peter.soetens@fmtc.be #endif #include #else -#include "corba.h" +#include "rtt/transports/corba/corba.h" #include #endif #include "OrocosTypesC.h" -#include "../../Logger.hpp" -#include "../../internal/DataSourceTypeInfo.hpp" +#include "rtt/Logger.hpp" +#include "rtt/internal/DataSourceTypeInfo.hpp" namespace RTT { diff --git a/rtt/transports/corba/CorbaDispatcher.cpp b/rtt/transports/corba/CorbaDispatcher.cpp index 8c8c7881d..79fef8e73 100644 --- a/rtt/transports/corba/CorbaDispatcher.cpp +++ b/rtt/transports/corba/CorbaDispatcher.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "CorbaDispatcher.hpp" +#include "rtt/transports/corba/CorbaDispatcher.hpp" namespace RTT { using namespace corba; diff --git a/rtt/transports/corba/CorbaDispatcher.hpp b/rtt/transports/corba/CorbaDispatcher.hpp index 9c5b71e06..7980f36d9 100644 --- a/rtt/transports/corba/CorbaDispatcher.hpp +++ b/rtt/transports/corba/CorbaDispatcher.hpp @@ -39,15 +39,15 @@ #ifndef ORO_CORBA_DISPATCHER_HPP #define ORO_CORBA_DISPATCHER_HPP -#include "../../os/MutexLock.hpp" -#include "../../Activity.hpp" -#include "../../base/ChannelElementBase.hpp" -#include "../../Logger.hpp" -#include "../../internal/List.hpp" -#include "../../types/GlobalsRepository.hpp" -#include "DataFlowI.h" -#include "../../DataFlowInterface.hpp" -#include "../../TaskContext.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/Activity.hpp" +#include "rtt/base/ChannelElementBase.hpp" +#include "rtt/Logger.hpp" +#include "rtt/internal/List.hpp" +#include "rtt/types/GlobalsRepository.hpp" +#include "rtt/transports/corba/DataFlowI.h" +#include "rtt/DataFlowInterface.hpp" +#include "rtt/TaskContext.hpp" namespace RTT { namespace corba { diff --git a/rtt/transports/corba/CorbaLib.cpp b/rtt/transports/corba/CorbaLib.cpp index ec74e3cbd..9a277edfc 100644 --- a/rtt/transports/corba/CorbaLib.cpp +++ b/rtt/transports/corba/CorbaLib.cpp @@ -36,22 +36,22 @@ ***************************************************************************/ -#include "corba.h" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO -#include "corba.h" +#include "rtt/transports/corba/corba.h" #include #else #include #include #endif -#include "TransportPlugin.hpp" -#include "CorbaTemplateProtocol.hpp" -#include "RTTCorbaConversion.hpp" -#include "../../types/TransportPlugin.hpp" -#include "../../types/TypekitPlugin.hpp" +#include "rtt/transports/corba/TransportPlugin.hpp" +#include "rtt/transports/corba/CorbaTemplateProtocol.hpp" +#include "rtt/transports/corba/RTTCorbaConversion.hpp" +#include "rtt/types/TransportPlugin.hpp" +#include "rtt/types/TypekitPlugin.hpp" #ifdef OS_RT_MALLOC -#include "../../rt_string.hpp" +#include "rtt/rt_string.hpp" #endif using namespace std; diff --git a/rtt/transports/corba/CorbaOperationCallerFactory.cpp b/rtt/transports/corba/CorbaOperationCallerFactory.cpp index c94830f90..cccf0b08f 100644 --- a/rtt/transports/corba/CorbaOperationCallerFactory.cpp +++ b/rtt/transports/corba/CorbaOperationCallerFactory.cpp @@ -36,15 +36,15 @@ ***************************************************************************/ -#include "CorbaOperationCallerFactory.hpp" -#include "AnyDataSource.hpp" -#include "CorbaLib.hpp" - -#include "../../types/Types.hpp" -#include "../../internal/DataSources.hpp" -#include "../../internal/DataSourceCommand.hpp" -#include "../../SendStatus.hpp" -#include "../../Handle.hpp" +#include "rtt/transports/corba/CorbaOperationCallerFactory.hpp" +#include "rtt/transports/corba/AnyDataSource.hpp" +#include "rtt/transports/corba/CorbaLib.hpp" + +#include "rtt/types/Types.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/internal/DataSourceCommand.hpp" +#include "rtt/SendStatus.hpp" +#include "rtt/Handle.hpp" using namespace std; using namespace RTT; diff --git a/rtt/transports/corba/CorbaOperationCallerFactory.hpp b/rtt/transports/corba/CorbaOperationCallerFactory.hpp index e1af22a13..1a1c2ef1e 100644 --- a/rtt/transports/corba/CorbaOperationCallerFactory.hpp +++ b/rtt/transports/corba/CorbaOperationCallerFactory.hpp @@ -40,15 +40,15 @@ #ifndef ORO_CORBAMETHODFACTORY_HPP #define ORO_CORBAMETHODFACTORY_HPP -#include "corba.h" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO #include #endif -#include "../../OperationInterface.hpp" -#include "../../FactoryExceptions.hpp" +#include "rtt/OperationInterface.hpp" +#include "rtt/FactoryExceptions.hpp" #include "ServiceC.h" -#include "CorbaConversion.hpp" -#include "CorbaTypeTransporter.hpp" +#include "rtt/transports/corba/CorbaConversion.hpp" +#include "rtt/transports/corba/CorbaTypeTransporter.hpp" namespace RTT {namespace corba diff --git a/rtt/transports/corba/CorbaTemplateProtocol.hpp b/rtt/transports/corba/CorbaTemplateProtocol.hpp index af337d839..1b91df382 100644 --- a/rtt/transports/corba/CorbaTemplateProtocol.hpp +++ b/rtt/transports/corba/CorbaTemplateProtocol.hpp @@ -39,15 +39,15 @@ #ifndef ORO_CORBA_TEMPATE_PROTOCOL_HPP #define ORO_CORBA_TEMPATE_PROTOCOL_HPP -#include "CorbaTypeTransporter.hpp" -#include "RemoteChannelElement.hpp" -#include "../../types/Types.hpp" -#include "../../InputPort.hpp" -#include "../../OutputPort.hpp" +#include "rtt/transports/corba/CorbaTypeTransporter.hpp" +#include "rtt/transports/corba/RemoteChannelElement.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" #include "ServiceC.h" -#include "DataFlowI.h" -#include "../../internal/ConnID.hpp" -#include "DataSourceProxy.hpp" +#include "rtt/transports/corba/DataFlowI.h" +#include "rtt/internal/ConnID.hpp" +#include "rtt/transports/corba/DataSourceProxy.hpp" namespace RTT { namespace corba diff --git a/rtt/transports/corba/CorbaTypeTransporter.cpp b/rtt/transports/corba/CorbaTypeTransporter.cpp index 02912998e..e72d3837e 100644 --- a/rtt/transports/corba/CorbaTypeTransporter.cpp +++ b/rtt/transports/corba/CorbaTypeTransporter.cpp @@ -43,8 +43,8 @@ * Author: kaltan */ -#include "CorbaTypeTransporter.hpp" -#include "DataFlowI.h" +#include "rtt/transports/corba/CorbaTypeTransporter.hpp" +#include "rtt/transports/corba/DataFlowI.h" using namespace RTT; using namespace RTT::corba; diff --git a/rtt/transports/corba/CorbaTypeTransporter.hpp b/rtt/transports/corba/CorbaTypeTransporter.hpp index 20f18e307..ae63d671f 100644 --- a/rtt/transports/corba/CorbaTypeTransporter.hpp +++ b/rtt/transports/corba/CorbaTypeTransporter.hpp @@ -39,8 +39,8 @@ #ifndef CORBA_TYPE_TRANSPORTER_H #define CORBA_TYPE_TRANSPORTER_H -#include "corba.h" -#include "../../types/TypeTransporter.hpp" +#include "rtt/transports/corba/corba.h" +#include "rtt/types/TypeTransporter.hpp" #include "ServiceC.h" namespace RTT { diff --git a/rtt/transports/corba/DataFlowI.cpp b/rtt/transports/corba/DataFlowI.cpp index 908c8b17e..2079f75a9 100644 --- a/rtt/transports/corba/DataFlowI.cpp +++ b/rtt/transports/corba/DataFlowI.cpp @@ -35,25 +35,25 @@ * * ***************************************************************************/ -#include "DataFlowI.h" -#include "corba.h" +#include "rtt/transports/corba/DataFlowI.h" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO #include "DataFlowS.h" #else #include "DataFlowC.h" #endif -#include "../../base/PortInterface.hpp" -#include "../../Logger.hpp" -#include "TaskContextProxy.hpp" -#include "CorbaTypeTransporter.hpp" -#include "../../InputPort.hpp" -#include "../../OutputPort.hpp" -#include "CorbaConnPolicy.hpp" -#include "CorbaLib.hpp" - -#include "RemotePorts.hpp" -#include "RemoteConnID.hpp" -#include +#include "rtt/base/PortInterface.hpp" +#include "rtt/Logger.hpp" +#include "rtt/transports/corba/TaskContextProxy.hpp" +#include "rtt/transports/corba/CorbaTypeTransporter.hpp" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" +#include "rtt/transports/corba/CorbaConnPolicy.hpp" +#include "rtt/transports/corba/CorbaLib.hpp" + +#include "rtt/transports/corba/RemotePorts.hpp" +#include "rtt/transports/corba/RemoteConnID.hpp" +#include "rtt/os/MutexLock.hpp" #include diff --git a/rtt/transports/corba/DataFlowI.h b/rtt/transports/corba/DataFlowI.h index 95a16d5d4..8b2a5101c 100644 --- a/rtt/transports/corba/DataFlowI.h +++ b/rtt/transports/corba/DataFlowI.h @@ -38,18 +38,18 @@ #ifndef DATAFLOWI_H_ #define DATAFLOWI_H_ -#include "corba.h" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO #include "DataFlowS.h" #else #include "DataFlowC.h" #endif -#include "CorbaConversion.hpp" -#include "../../base/ChannelElement.hpp" -#include "../../internal/DataSources.hpp" -#include "CorbaTypeTransporter.hpp" +#include "rtt/transports/corba/CorbaConversion.hpp" +#include "rtt/base/ChannelElement.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/transports/corba/CorbaTypeTransporter.hpp" #include -#include +#include "rtt/os/Mutex.hpp" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/rtt/transports/corba/DataSourceProxy.hpp b/rtt/transports/corba/DataSourceProxy.hpp index d54a8baa0..d164f68e3 100644 --- a/rtt/transports/corba/DataSourceProxy.hpp +++ b/rtt/transports/corba/DataSourceProxy.hpp @@ -39,12 +39,12 @@ #ifndef ORO_CORBA_DATASOURCE_PROXY_HPP #define ORO_CORBA_DATASOURCE_PROXY_HPP -#include "../../internal/DataSource.hpp" -#include "../../Logger.hpp" -#include "../../base/ActionInterface.hpp" -#include "CorbaConversion.hpp" -#include "CorbaTypeTransporter.hpp" -#include "CorbaLib.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/Logger.hpp" +#include "rtt/base/ActionInterface.hpp" +#include "rtt/transports/corba/CorbaConversion.hpp" +#include "rtt/transports/corba/CorbaTypeTransporter.hpp" +#include "rtt/transports/corba/CorbaLib.hpp" #include namespace RTT diff --git a/rtt/transports/corba/OperationCallerProxy.hpp b/rtt/transports/corba/OperationCallerProxy.hpp index c20eac5cf..8f92abe8f 100644 --- a/rtt/transports/corba/OperationCallerProxy.hpp +++ b/rtt/transports/corba/OperationCallerProxy.hpp @@ -38,8 +38,8 @@ #include "ServiceRequesterC.h" #include -#include "../../base/OperationCallerBaseInvoker.hpp" -#include "CorbaOperationCallerFactory.hpp" +#include "rtt/base/OperationCallerBaseInvoker.hpp" +#include "rtt/transports/corba/CorbaOperationCallerFactory.hpp" namespace RTT { diff --git a/rtt/transports/corba/OperationInterfaceI.cpp b/rtt/transports/corba/OperationInterfaceI.cpp index 0a8ad0cc5..037cee01b 100644 --- a/rtt/transports/corba/OperationInterfaceI.cpp +++ b/rtt/transports/corba/OperationInterfaceI.cpp @@ -66,16 +66,16 @@ // TAO_IDL - Generated from // ../../../ACE_wrappers/TAO/TAO_IDL/be/be_codegen.cpp:1196 -#include "CorbaLib.hpp" -#include "CorbaTypeTransporter.hpp" -#include "OperationInterfaceI.h" -#include "AnyDataSource.hpp" -#include "../../rtt-detail-fwd.hpp" -#include "../../internal/OperationCallerC.hpp" -#include "../../internal/SendHandleC.hpp" -#include "../../Logger.hpp" -#include "../../internal/GlobalEngine.hpp" -#include "../../plugin/PluginLoader.hpp" +#include "rtt/transports/corba/CorbaLib.hpp" +#include "rtt/transports/corba/CorbaTypeTransporter.hpp" +#include "rtt/transports/corba/OperationInterfaceI.h" +#include "rtt/transports/corba/AnyDataSource.hpp" +#include "rtt/rtt-detail-fwd.hpp" +#include "rtt/internal/OperationCallerC.hpp" +#include "rtt/internal/SendHandleC.hpp" +#include "rtt/Logger.hpp" +#include "rtt/internal/GlobalEngine.hpp" +#include "rtt/plugin/PluginLoader.hpp" using namespace RTT; using namespace RTT::detail; diff --git a/rtt/transports/corba/OperationInterfaceI.h b/rtt/transports/corba/OperationInterfaceI.h index 4de2c2ade..2f6965929 100644 --- a/rtt/transports/corba/OperationInterfaceI.h +++ b/rtt/transports/corba/OperationInterfaceI.h @@ -69,15 +69,15 @@ #ifndef ORO_CORBA_OPERATIONREPOSITORYI_H_ #define ORO_CORBA_OPERATIONREPOSITORYI_H_ -#include "corba.h" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO #include "OperationInterfaceS.h" #else #include "OperationInterfaceC.h" #endif -#include "../../OperationInterface.hpp" -#include "../../internal/SendHandleC.hpp" -#include "../../internal/OperationInterfacePartFused.hpp" +#include "rtt/OperationInterface.hpp" +#include "rtt/internal/SendHandleC.hpp" +#include "rtt/internal/OperationInterfacePartFused.hpp" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/rtt/transports/corba/POAUtility.cpp b/rtt/transports/corba/POAUtility.cpp index f45013c94..e80eb5f4c 100644 --- a/rtt/transports/corba/POAUtility.cpp +++ b/rtt/transports/corba/POAUtility.cpp @@ -36,297 +36,297 @@ ***************************************************************************/ - -#include "POAUtility.h" - -PortableServer::POA_ptr -POAUtility::create_basic_POA( - PortableServer::POA_ptr parentPOAP, - PortableServer::POAManager_ptr POAManagerP, - const char * POAName, - CORBA::Boolean isMultiThread, - CORBA::Boolean isPersistent -) -{ - // Create a policy list. - CORBA::PolicyList policies; - policies.length(4); - CORBA::ULong i = 0; - - // Thread Policy - PortableServer::ThreadPolicyValue threadPolicy; - - if (isMultiThread) { - threadPolicy = PortableServer::ORB_CTRL_MODEL; - } - else { - threadPolicy = PortableServer::SINGLE_THREAD_MODEL; - } - policies[i] = parentPOAP->create_thread_policy(threadPolicy); - - // Lifespan and IdAssignment Policies - PortableServer::LifespanPolicyValue lifeSpanPolicy; - PortableServer::IdAssignmentPolicyValue idAssignPolicy; - PortableServer::ImplicitActivationPolicyValue implicitActivationPolicy; - - if (isPersistent) { - // Policies for 'Entity' objects - lifeSpanPolicy = PortableServer::PERSISTENT; - idAssignPolicy = PortableServer::USER_ID; - } - else { - // Policies for 'Session' objects - lifeSpanPolicy = PortableServer::TRANSIENT; - idAssignPolicy = PortableServer::SYSTEM_ID; - } - - implicitActivationPolicy = PortableServer::IMPLICIT_ACTIVATION; - - // Lifespan Policy - i++; - policies[i] = parentPOAP->create_lifespan_policy(lifeSpanPolicy); - - // IdAssignment Policy - i++; - policies[i] = parentPOAP->create_id_assignment_policy(idAssignPolicy); - - // IdUniqueness Policy - Default = UNIQUE_ID - - // ImplicitActivation Policy - Default = NO_IMPLICIT_ACTIVATION - // Override by PS: - i++; - policies[i] = parentPOAP->create_implicit_activation_policy(implicitActivationPolicy); - - - // RequestProcessing Policy - Default = USE_ACTIVE_OBJECT_MAP_ONLY - - // ServantRetention Policy - Default = RETAIN - - return parentPOAP->create_POA(POAName, POAManagerP, policies); -} - - -PortableServer::POA_ptr -POAUtility::create_service_POA( - PortableServer::POA_ptr parentPOAP, - PortableServer::POAManager_ptr POAManagerP, - const char * POAName, - CORBA::Boolean isMultiThread -) -{ - // Create a policy list. - CORBA::PolicyList policies; - policies.length(2); - CORBA::ULong i = 0; - - // Thread Policy - PortableServer::ThreadPolicyValue threadPolicy; - - if (isMultiThread) { - threadPolicy = PortableServer::ORB_CTRL_MODEL; - } - else { - threadPolicy = PortableServer::SINGLE_THREAD_MODEL; - } - policies[i] = parentPOAP->create_thread_policy(threadPolicy); - - // LifeSpan Policy - Default = TRANSIENT - - // IdAssignment Policy - Default = SYSTEM_ID - - // IdUniqueness Policy - i++; - policies[i] = parentPOAP->create_id_uniqueness_policy( - PortableServer::MULTIPLE_ID - ); - - // ImplicitActivation Policy - Default = NO_IMPLICIT_ACTIVATION - - // RequestProcessing Policy - Default = USE_ACTIVE_OBJECT_MAP_ONLY - - // ServantRetention Policy - Default = RETAIN - - return parentPOAP->create_POA(POAName, POAManagerP, policies); -} - - -PortableServer::POA_ptr -POAUtility::create_servant_activator_POA( - PortableServer::POA_ptr parentPOAP, - PortableServer::POAManager_ptr POAManagerP, - const char * POAName, - CORBA::Boolean isMultiThread, - CORBA::Boolean isPersistent -) -{ - // Create a policy list. - CORBA::PolicyList policies; - policies.length(4); - CORBA::ULong i = 0; - - // Thread Policy - PortableServer::ThreadPolicyValue threadPolicy; - - if (isMultiThread) { - threadPolicy = PortableServer::ORB_CTRL_MODEL; - } - else { - threadPolicy = PortableServer::SINGLE_THREAD_MODEL; - } - policies[i] = parentPOAP->create_thread_policy(threadPolicy); - - PortableServer::LifespanPolicyValue lifeSpanPolicy; - PortableServer::IdAssignmentPolicyValue idAssignPolicy; - - // Lifespan and IdAssignment Policies - if (isPersistent) { - // Policies for 'Entity' objects - lifeSpanPolicy = PortableServer::PERSISTENT; - idAssignPolicy = PortableServer::USER_ID; - } - else { - // Policies for 'Session' objects - lifeSpanPolicy = PortableServer::TRANSIENT; - idAssignPolicy = PortableServer::SYSTEM_ID; - } - - // Lifespan Policy - i++; - policies[i] = parentPOAP->create_lifespan_policy(lifeSpanPolicy); - - // IdAssignment Policy - i++; - policies[i] = parentPOAP->create_id_assignment_policy(idAssignPolicy); - - // IdUniqueness Policy - Default = UNIQUE_ID - - // ImplicitActivation Policy - Default = NO_IMPLICIT_ACTIVATION - - // RequestProcessing Policy - i++; - policies[i] = parentPOAP->create_request_processing_policy( - PortableServer::USE_SERVANT_MANAGER - ); - - // ServantRetention Policy - Default = RETAIN - - return parentPOAP->create_POA(POAName, POAManagerP, policies); -} - - -PortableServer::POA_ptr -POAUtility::create_servant_locator_POA( - PortableServer::POA_ptr parentPOAP, - PortableServer::POAManager_ptr POAManagerP, - const char * POAName, - CORBA::Boolean isMultiThread, - CORBA::Boolean isPersistent -) -{ - // Create a policy list. - CORBA::PolicyList policies; - policies.length(5); - CORBA::ULong i = 0; - - // Thread Policy - PortableServer::ThreadPolicyValue threadPolicy; - - if (isMultiThread) { - threadPolicy = PortableServer::ORB_CTRL_MODEL; - } - else { - threadPolicy = PortableServer::SINGLE_THREAD_MODEL; - } - policies[i] = parentPOAP->create_thread_policy(threadPolicy); - - PortableServer::LifespanPolicyValue lifeSpanPolicy; - PortableServer::IdAssignmentPolicyValue idAssignPolicy; - - // Lifespan and IdAssignment Policies - if (isPersistent) { - // Policies for 'Entity' objects - lifeSpanPolicy = PortableServer::PERSISTENT; - idAssignPolicy = PortableServer::USER_ID; - } - else { - // Policies for 'Session' objects - lifeSpanPolicy = PortableServer::TRANSIENT; - idAssignPolicy = PortableServer::SYSTEM_ID; - } - - // Lifespan Policy - i++; - policies[i] = parentPOAP->create_lifespan_policy(lifeSpanPolicy); - - // IdAssignment Policy - i++; - policies[i] = parentPOAP->create_id_assignment_policy(idAssignPolicy); - - // IdUniqueness Policy - Default = UNIQUE_ID - - // ImplicitActivation Policy - Default = NO_IMPLICIT_ACTIVATION - - // RequestProcessing Policy - i++; - policies[i] = parentPOAP->create_request_processing_policy( - PortableServer::USE_SERVANT_MANAGER - ); - - // ServantRetention Policy - i++; - policies[i] = parentPOAP->create_servant_retention_policy( - PortableServer::NON_RETAIN - ); - - return parentPOAP->create_POA(POAName, POAManagerP, policies); -} - - -PortableServer::POA_ptr -POAUtility::create_default_servant_POA( - PortableServer::POA_ptr parentPOAP, - PortableServer::POAManager_ptr POAManagerP, - const char * POAName, - CORBA::Boolean isMultiThread -) -{ - // Create a policy list. - CORBA::PolicyList policies; - policies.length(3); - CORBA::ULong i = 0; - - // Thread Policy - PortableServer::ThreadPolicyValue threadPolicy; - - if (isMultiThread) { - threadPolicy = PortableServer::ORB_CTRL_MODEL; - } - else { - threadPolicy = PortableServer::SINGLE_THREAD_MODEL; - } - policies[i] = parentPOAP->create_thread_policy(threadPolicy); - - // LifeSpan Policy - Default = TRANSIENT - - // IdAssignment Policy - Default = SYSTEM_ID - - // IdUniqueness Policy - Default = UNIQUE_ID - - // ImplicitActivation Policy - Default = NO_IMPLICIT_ACTIVATION - - // RequestProcessing Policy - i++; - policies[i] = parentPOAP->create_request_processing_policy( - PortableServer::USE_DEFAULT_SERVANT - ); - - // ServantRetention Policy - i++; - policies[i] = parentPOAP->create_servant_retention_policy( - PortableServer::NON_RETAIN - ); - - return parentPOAP->create_POA(POAName, POAManagerP, policies); -} - - + +#include "rtt/transports/corba/POAUtility.h" + +PortableServer::POA_ptr +POAUtility::create_basic_POA( + PortableServer::POA_ptr parentPOAP, + PortableServer::POAManager_ptr POAManagerP, + const char * POAName, + CORBA::Boolean isMultiThread, + CORBA::Boolean isPersistent +) +{ + // Create a policy list. + CORBA::PolicyList policies; + policies.length(4); + CORBA::ULong i = 0; + + // Thread Policy + PortableServer::ThreadPolicyValue threadPolicy; + + if (isMultiThread) { + threadPolicy = PortableServer::ORB_CTRL_MODEL; + } + else { + threadPolicy = PortableServer::SINGLE_THREAD_MODEL; + } + policies[i] = parentPOAP->create_thread_policy(threadPolicy); + + // Lifespan and IdAssignment Policies + PortableServer::LifespanPolicyValue lifeSpanPolicy; + PortableServer::IdAssignmentPolicyValue idAssignPolicy; + PortableServer::ImplicitActivationPolicyValue implicitActivationPolicy; + + if (isPersistent) { + // Policies for 'Entity' objects + lifeSpanPolicy = PortableServer::PERSISTENT; + idAssignPolicy = PortableServer::USER_ID; + } + else { + // Policies for 'Session' objects + lifeSpanPolicy = PortableServer::TRANSIENT; + idAssignPolicy = PortableServer::SYSTEM_ID; + } + + implicitActivationPolicy = PortableServer::IMPLICIT_ACTIVATION; + + // Lifespan Policy + i++; + policies[i] = parentPOAP->create_lifespan_policy(lifeSpanPolicy); + + // IdAssignment Policy + i++; + policies[i] = parentPOAP->create_id_assignment_policy(idAssignPolicy); + + // IdUniqueness Policy - Default = UNIQUE_ID + + // ImplicitActivation Policy - Default = NO_IMPLICIT_ACTIVATION + // Override by PS: + i++; + policies[i] = parentPOAP->create_implicit_activation_policy(implicitActivationPolicy); + + + // RequestProcessing Policy - Default = USE_ACTIVE_OBJECT_MAP_ONLY + + // ServantRetention Policy - Default = RETAIN + + return parentPOAP->create_POA(POAName, POAManagerP, policies); +} + + +PortableServer::POA_ptr +POAUtility::create_service_POA( + PortableServer::POA_ptr parentPOAP, + PortableServer::POAManager_ptr POAManagerP, + const char * POAName, + CORBA::Boolean isMultiThread +) +{ + // Create a policy list. + CORBA::PolicyList policies; + policies.length(2); + CORBA::ULong i = 0; + + // Thread Policy + PortableServer::ThreadPolicyValue threadPolicy; + + if (isMultiThread) { + threadPolicy = PortableServer::ORB_CTRL_MODEL; + } + else { + threadPolicy = PortableServer::SINGLE_THREAD_MODEL; + } + policies[i] = parentPOAP->create_thread_policy(threadPolicy); + + // LifeSpan Policy - Default = TRANSIENT + + // IdAssignment Policy - Default = SYSTEM_ID + + // IdUniqueness Policy + i++; + policies[i] = parentPOAP->create_id_uniqueness_policy( + PortableServer::MULTIPLE_ID + ); + + // ImplicitActivation Policy - Default = NO_IMPLICIT_ACTIVATION + + // RequestProcessing Policy - Default = USE_ACTIVE_OBJECT_MAP_ONLY + + // ServantRetention Policy - Default = RETAIN + + return parentPOAP->create_POA(POAName, POAManagerP, policies); +} + + +PortableServer::POA_ptr +POAUtility::create_servant_activator_POA( + PortableServer::POA_ptr parentPOAP, + PortableServer::POAManager_ptr POAManagerP, + const char * POAName, + CORBA::Boolean isMultiThread, + CORBA::Boolean isPersistent +) +{ + // Create a policy list. + CORBA::PolicyList policies; + policies.length(4); + CORBA::ULong i = 0; + + // Thread Policy + PortableServer::ThreadPolicyValue threadPolicy; + + if (isMultiThread) { + threadPolicy = PortableServer::ORB_CTRL_MODEL; + } + else { + threadPolicy = PortableServer::SINGLE_THREAD_MODEL; + } + policies[i] = parentPOAP->create_thread_policy(threadPolicy); + + PortableServer::LifespanPolicyValue lifeSpanPolicy; + PortableServer::IdAssignmentPolicyValue idAssignPolicy; + + // Lifespan and IdAssignment Policies + if (isPersistent) { + // Policies for 'Entity' objects + lifeSpanPolicy = PortableServer::PERSISTENT; + idAssignPolicy = PortableServer::USER_ID; + } + else { + // Policies for 'Session' objects + lifeSpanPolicy = PortableServer::TRANSIENT; + idAssignPolicy = PortableServer::SYSTEM_ID; + } + + // Lifespan Policy + i++; + policies[i] = parentPOAP->create_lifespan_policy(lifeSpanPolicy); + + // IdAssignment Policy + i++; + policies[i] = parentPOAP->create_id_assignment_policy(idAssignPolicy); + + // IdUniqueness Policy - Default = UNIQUE_ID + + // ImplicitActivation Policy - Default = NO_IMPLICIT_ACTIVATION + + // RequestProcessing Policy + i++; + policies[i] = parentPOAP->create_request_processing_policy( + PortableServer::USE_SERVANT_MANAGER + ); + + // ServantRetention Policy - Default = RETAIN + + return parentPOAP->create_POA(POAName, POAManagerP, policies); +} + + +PortableServer::POA_ptr +POAUtility::create_servant_locator_POA( + PortableServer::POA_ptr parentPOAP, + PortableServer::POAManager_ptr POAManagerP, + const char * POAName, + CORBA::Boolean isMultiThread, + CORBA::Boolean isPersistent +) +{ + // Create a policy list. + CORBA::PolicyList policies; + policies.length(5); + CORBA::ULong i = 0; + + // Thread Policy + PortableServer::ThreadPolicyValue threadPolicy; + + if (isMultiThread) { + threadPolicy = PortableServer::ORB_CTRL_MODEL; + } + else { + threadPolicy = PortableServer::SINGLE_THREAD_MODEL; + } + policies[i] = parentPOAP->create_thread_policy(threadPolicy); + + PortableServer::LifespanPolicyValue lifeSpanPolicy; + PortableServer::IdAssignmentPolicyValue idAssignPolicy; + + // Lifespan and IdAssignment Policies + if (isPersistent) { + // Policies for 'Entity' objects + lifeSpanPolicy = PortableServer::PERSISTENT; + idAssignPolicy = PortableServer::USER_ID; + } + else { + // Policies for 'Session' objects + lifeSpanPolicy = PortableServer::TRANSIENT; + idAssignPolicy = PortableServer::SYSTEM_ID; + } + + // Lifespan Policy + i++; + policies[i] = parentPOAP->create_lifespan_policy(lifeSpanPolicy); + + // IdAssignment Policy + i++; + policies[i] = parentPOAP->create_id_assignment_policy(idAssignPolicy); + + // IdUniqueness Policy - Default = UNIQUE_ID + + // ImplicitActivation Policy - Default = NO_IMPLICIT_ACTIVATION + + // RequestProcessing Policy + i++; + policies[i] = parentPOAP->create_request_processing_policy( + PortableServer::USE_SERVANT_MANAGER + ); + + // ServantRetention Policy + i++; + policies[i] = parentPOAP->create_servant_retention_policy( + PortableServer::NON_RETAIN + ); + + return parentPOAP->create_POA(POAName, POAManagerP, policies); +} + + +PortableServer::POA_ptr +POAUtility::create_default_servant_POA( + PortableServer::POA_ptr parentPOAP, + PortableServer::POAManager_ptr POAManagerP, + const char * POAName, + CORBA::Boolean isMultiThread +) +{ + // Create a policy list. + CORBA::PolicyList policies; + policies.length(3); + CORBA::ULong i = 0; + + // Thread Policy + PortableServer::ThreadPolicyValue threadPolicy; + + if (isMultiThread) { + threadPolicy = PortableServer::ORB_CTRL_MODEL; + } + else { + threadPolicy = PortableServer::SINGLE_THREAD_MODEL; + } + policies[i] = parentPOAP->create_thread_policy(threadPolicy); + + // LifeSpan Policy - Default = TRANSIENT + + // IdAssignment Policy - Default = SYSTEM_ID + + // IdUniqueness Policy - Default = UNIQUE_ID + + // ImplicitActivation Policy - Default = NO_IMPLICIT_ACTIVATION + + // RequestProcessing Policy + i++; + policies[i] = parentPOAP->create_request_processing_policy( + PortableServer::USE_DEFAULT_SERVANT + ); + + // ServantRetention Policy + i++; + policies[i] = parentPOAP->create_servant_retention_policy( + PortableServer::NON_RETAIN + ); + + return parentPOAP->create_POA(POAName, POAManagerP, policies); +} + + diff --git a/rtt/transports/corba/POAUtility.h b/rtt/transports/corba/POAUtility.h index 9af6c551a..3a830b5bc 100644 --- a/rtt/transports/corba/POAUtility.h +++ b/rtt/transports/corba/POAUtility.h @@ -36,67 +36,67 @@ ***************************************************************************/ -#ifndef RTT_CORBA_POAUTILITY_H_ -#define RTT_CORBA_POAUTILITY_H_ - -#include "corba.h" +#ifndef RTT_CORBA_POAUTILITY_H_ +#define RTT_CORBA_POAUTILITY_H_ + +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO -#include +#include +#endif + + + +class POAUtility { + +public: + + static PortableServer::POA_ptr + create_basic_POA( + PortableServer::POA_ptr parentPOAP, + PortableServer::POAManager_ptr POAManagerP, + const char * POAName, + CORBA::Boolean isMultiThread, + CORBA::Boolean isPersistent + ); + + + static PortableServer::POA_ptr + create_service_POA( + PortableServer::POA_ptr parentPOAP, + PortableServer::POAManager_ptr POAManagerP, + const char * POAName, + CORBA::Boolean isMultiThread + ); + + + static PortableServer::POA_ptr + create_servant_activator_POA( + PortableServer::POA_ptr parentPOAP, + PortableServer::POAManager_ptr POAManagerP, + const char * POAName, + CORBA::Boolean isMultiThread, + CORBA::Boolean isPersistent + ); + + + static PortableServer::POA_ptr + create_servant_locator_POA( + PortableServer::POA_ptr parentPOAP, + PortableServer::POAManager_ptr POAManagerP, + const char * POAName, + CORBA::Boolean isMultiThread, + CORBA::Boolean isPersistent + ); + + + static PortableServer::POA_ptr + create_default_servant_POA( + PortableServer::POA_ptr parentPOAP, + PortableServer::POAManager_ptr POAManagerP, + const char * POAName, + CORBA::Boolean isMultiThread + ); + +}; + #endif - - - -class POAUtility { - -public: - - static PortableServer::POA_ptr - create_basic_POA( - PortableServer::POA_ptr parentPOAP, - PortableServer::POAManager_ptr POAManagerP, - const char * POAName, - CORBA::Boolean isMultiThread, - CORBA::Boolean isPersistent - ); - - - static PortableServer::POA_ptr - create_service_POA( - PortableServer::POA_ptr parentPOAP, - PortableServer::POAManager_ptr POAManagerP, - const char * POAName, - CORBA::Boolean isMultiThread - ); - - - static PortableServer::POA_ptr - create_servant_activator_POA( - PortableServer::POA_ptr parentPOAP, - PortableServer::POAManager_ptr POAManagerP, - const char * POAName, - CORBA::Boolean isMultiThread, - CORBA::Boolean isPersistent - ); - - - static PortableServer::POA_ptr - create_servant_locator_POA( - PortableServer::POA_ptr parentPOAP, - PortableServer::POAManager_ptr POAManagerP, - const char * POAName, - CORBA::Boolean isMultiThread, - CORBA::Boolean isPersistent - ); - - - static PortableServer::POA_ptr - create_default_servant_POA( - PortableServer::POA_ptr parentPOAP, - PortableServer::POAManager_ptr POAManagerP, - const char * POAName, - CORBA::Boolean isMultiThread - ); - -}; - -#endif diff --git a/rtt/transports/corba/RTTCorbaConversion.hpp b/rtt/transports/corba/RTTCorbaConversion.hpp index 2435d0256..4e0daefe6 100644 --- a/rtt/transports/corba/RTTCorbaConversion.hpp +++ b/rtt/transports/corba/RTTCorbaConversion.hpp @@ -40,14 +40,14 @@ email : peter.soetens@fmtc.be #define ORO_RTT_CORBA_CONVERSION_HPP -#include "CorbaConversion.hpp" +#include "rtt/transports/corba/CorbaConversion.hpp" #include "OrocosTypesC.h" #include "TaskContextC.h" -#include "TaskContextServer.hpp" -#include "TaskContextProxy.hpp" -#include "CorbaConnPolicy.hpp" +#include "rtt/transports/corba/TaskContextServer.hpp" +#include "rtt/transports/corba/TaskContextProxy.hpp" +#include "rtt/transports/corba/CorbaConnPolicy.hpp" #ifdef OS_RT_MALLOC -#include +#include "rtt/rt_string.hpp" #endif namespace RTT { diff --git a/rtt/transports/corba/RemoteChannelElement.hpp b/rtt/transports/corba/RemoteChannelElement.hpp index fd2fa14e1..458cb5c96 100644 --- a/rtt/transports/corba/RemoteChannelElement.hpp +++ b/rtt/transports/corba/RemoteChannelElement.hpp @@ -39,11 +39,11 @@ #ifndef CORBA_REMOTE_CHANNEL_ELEMENT_H #define CORBA_REMOTE_CHANNEL_ELEMENT_H -#include "DataFlowI.h" -#include "CorbaTypeTransporter.hpp" -#include "CorbaDispatcher.hpp" -#include "CorbaConnPolicy.hpp" -#include "ApplicationServer.hpp" +#include "rtt/transports/corba/DataFlowI.h" +#include "rtt/transports/corba/CorbaTypeTransporter.hpp" +#include "rtt/transports/corba/CorbaDispatcher.hpp" +#include "rtt/transports/corba/CorbaConnPolicy.hpp" +#include "rtt/transports/corba/ApplicationServer.hpp" namespace RTT { diff --git a/rtt/transports/corba/RemoteConnID.cpp b/rtt/transports/corba/RemoteConnID.cpp index 71f2535bb..e34aa9f7e 100644 --- a/rtt/transports/corba/RemoteConnID.cpp +++ b/rtt/transports/corba/RemoteConnID.cpp @@ -43,7 +43,7 @@ * Author: kaltan */ -#include "RemoteConnID.hpp" +#include "rtt/transports/corba/RemoteConnID.hpp" using namespace RTT::corba; diff --git a/rtt/transports/corba/RemoteConnID.hpp b/rtt/transports/corba/RemoteConnID.hpp index e7f3b55d8..33b13e098 100644 --- a/rtt/transports/corba/RemoteConnID.hpp +++ b/rtt/transports/corba/RemoteConnID.hpp @@ -43,7 +43,7 @@ * Author: kaltan */ -#include "../../internal/ConnID.hpp" +#include "rtt/internal/ConnID.hpp" #include "DataFlowC.h" #include diff --git a/rtt/transports/corba/RemotePorts.cpp b/rtt/transports/corba/RemotePorts.cpp index 9f0421ff1..ac5e4e100 100644 --- a/rtt/transports/corba/RemotePorts.cpp +++ b/rtt/transports/corba/RemotePorts.cpp @@ -36,16 +36,16 @@ ***************************************************************************/ -#include "RemotePorts.hpp" -#include "CorbaTypeTransporter.hpp" -#include "DataFlowI.h" -#include "../../DataFlowInterface.hpp" +#include "rtt/transports/corba/RemotePorts.hpp" +#include "rtt/transports/corba/CorbaTypeTransporter.hpp" +#include "rtt/transports/corba/DataFlowI.h" +#include "rtt/DataFlowInterface.hpp" #include -#include "CorbaConnPolicy.hpp" -#include "CorbaLib.hpp" -#include "RemoteConnID.hpp" -#include "../../internal/ConnID.hpp" -#include "../../rtt-detail-fwd.hpp" +#include "rtt/transports/corba/CorbaConnPolicy.hpp" +#include "rtt/transports/corba/CorbaLib.hpp" +#include "rtt/transports/corba/RemoteConnID.hpp" +#include "rtt/internal/ConnID.hpp" +#include "rtt/rtt-detail-fwd.hpp" using namespace std; using namespace RTT::detail; diff --git a/rtt/transports/corba/RemotePorts.hpp b/rtt/transports/corba/RemotePorts.hpp index 6dfdf9ec7..7c9cc3d7e 100644 --- a/rtt/transports/corba/RemotePorts.hpp +++ b/rtt/transports/corba/RemotePorts.hpp @@ -39,11 +39,11 @@ #ifndef RTT_CORBA_REMOTE_PORTS_HPP #define RTT_CORBA_REMOTE_PORTS_HPP -#include "../../base/PortInterface.hpp" -#include "../../base/ChannelElement.hpp" -#include "../../InputPort.hpp" -#include "../../OutputPort.hpp" -#include "DataFlowI.h" +#include "rtt/base/PortInterface.hpp" +#include "rtt/base/ChannelElement.hpp" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" +#include "rtt/transports/corba/DataFlowI.h" #include namespace RTT { diff --git a/rtt/transports/corba/ServiceI.cpp b/rtt/transports/corba/ServiceI.cpp index 4a1784961..dbe051545 100644 --- a/rtt/transports/corba/ServiceI.cpp +++ b/rtt/transports/corba/ServiceI.cpp @@ -66,8 +66,8 @@ // TAO_IDL - Generated from // ../../../ACE_wrappers/TAO/TAO_IDL/be/be_codegen.cpp:1196 -#include "ServiceI.h" -#include "CorbaLib.hpp" +#include "rtt/transports/corba/ServiceI.h" +#include "rtt/transports/corba/CorbaLib.hpp" using namespace RTT; using namespace RTT::detail; diff --git a/rtt/transports/corba/ServiceI.h b/rtt/transports/corba/ServiceI.h index f2a60254b..0e178e0db 100644 --- a/rtt/transports/corba/ServiceI.h +++ b/rtt/transports/corba/ServiceI.h @@ -69,17 +69,17 @@ #ifndef ORO_CORBA_SERVICEI_H_ #define ORO_CORBA_SERVICEI_H_ -#include "corba.h" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO #include "ServiceS.h" #else #include "ServiceC.h" #endif -#include "../../Service.hpp" -#include "ConfigurationInterfaceI.h" -#include "OperationInterfaceI.h" -#include "DataFlowI.h" +#include "rtt/Service.hpp" +#include "rtt/transports/corba/ConfigurationInterfaceI.h" +#include "rtt/transports/corba/OperationInterfaceI.h" +#include "rtt/transports/corba/DataFlowI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/rtt/transports/corba/ServiceRequesterI.cpp b/rtt/transports/corba/ServiceRequesterI.cpp index 5bcf9c65f..f799df058 100644 --- a/rtt/transports/corba/ServiceRequesterI.cpp +++ b/rtt/transports/corba/ServiceRequesterI.cpp @@ -66,9 +66,9 @@ // TAO_IDL - Generated from // ../../../ACE_wrappers/TAO/TAO_IDL/be/be_codegen.cpp:1196 -#include "ServiceRequesterI.h" -#include "CorbaOperationCallerFactory.hpp" -#include "TaskContext.hpp" +#include "rtt/transports/corba/ServiceRequesterI.h" +#include "rtt/transports/corba/CorbaOperationCallerFactory.hpp" +#include "rtt/TaskContext.hpp" using namespace RTT; using namespace RTT::detail; diff --git a/rtt/transports/corba/ServiceRequesterI.h b/rtt/transports/corba/ServiceRequesterI.h index e7a611e77..d2b28b78f 100644 --- a/rtt/transports/corba/ServiceRequesterI.h +++ b/rtt/transports/corba/ServiceRequesterI.h @@ -69,14 +69,14 @@ #ifndef ORO_CORBA_SERVICEREQUESTERI_H_ #define ORO_CORBA_SERVICEREQUESTERI_H_ -#include "corba.h" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO #include "ServiceRequesterS.h" #else #include "ServiceRequesterC.h" #endif -#include "../../ServiceRequester.hpp" +#include "rtt/ServiceRequester.hpp" #include #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/rtt/transports/corba/TaskContextFactory.cpp b/rtt/transports/corba/TaskContextFactory.cpp index 9a3cc561a..c6a60d1b0 100644 --- a/rtt/transports/corba/TaskContextFactory.cpp +++ b/rtt/transports/corba/TaskContextFactory.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "TaskContextFactory.hpp" -#include "TaskContextProxy.hpp" +#include "rtt/transports/corba/TaskContextFactory.hpp" +#include "rtt/transports/corba/TaskContextProxy.hpp" bool RTT::corba::TaskContextFactory::InitOrb(int argc, char* argv[], Seconds orb_timeout) { diff --git a/rtt/transports/corba/TaskContextFactory.hpp b/rtt/transports/corba/TaskContextFactory.hpp index bc1869210..ed724628d 100644 --- a/rtt/transports/corba/TaskContextFactory.hpp +++ b/rtt/transports/corba/TaskContextFactory.hpp @@ -39,7 +39,7 @@ #define ORO_CORBA_CONTROLTASK_FACTORY_HPP -#include "../../TaskContext.hpp" +#include "rtt/TaskContext.hpp" namespace RTT {namespace corba diff --git a/rtt/transports/corba/TaskContextI.cpp b/rtt/transports/corba/TaskContextI.cpp index 222062473..69f4d4698 100644 --- a/rtt/transports/corba/TaskContextI.cpp +++ b/rtt/transports/corba/TaskContextI.cpp @@ -66,14 +66,14 @@ // TAO_IDL - Generated from // ../../../ACE_wrappers/TAO/TAO_IDL/be/be_codegen.cpp:1196 -#include "TaskContextI.h" -#include "TaskContextServer.hpp" -#include "TaskContextProxy.hpp" -#include "ServiceI.h" -#include "ServiceRequesterI.h" -#include "DataFlowI.h" -#include "../../OperationCaller.hpp" -#include "../../rtt-detail-fwd.hpp" +#include "rtt/transports/corba/TaskContextI.h" +#include "rtt/transports/corba/TaskContextServer.hpp" +#include "rtt/transports/corba/TaskContextProxy.hpp" +#include "rtt/transports/corba/ServiceI.h" +#include "rtt/transports/corba/ServiceRequesterI.h" +#include "rtt/transports/corba/DataFlowI.h" +#include "rtt/OperationCaller.hpp" +#include "rtt/rtt-detail-fwd.hpp" using namespace RTT; diff --git a/rtt/transports/corba/TaskContextI.h b/rtt/transports/corba/TaskContextI.h index 84f794374..976c0e9c0 100644 --- a/rtt/transports/corba/TaskContextI.h +++ b/rtt/transports/corba/TaskContextI.h @@ -69,7 +69,7 @@ #ifndef ORO_CORBA_TASKCONTEXTI_H_ #define ORO_CORBA_TASKCONTEXTI_H_ -#include "corba.h" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO #include "TaskContextS.h" #else @@ -79,7 +79,7 @@ #include "ServiceC.h" #include "ServiceRequesterC.h" #include "DataFlowC.h" -#include "../../TaskContext.hpp" +#include "rtt/TaskContext.hpp" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/rtt/transports/corba/TaskContextProxy.cpp b/rtt/transports/corba/TaskContextProxy.cpp index 67edd6e33..6ccecf54e 100644 --- a/rtt/transports/corba/TaskContextProxy.cpp +++ b/rtt/transports/corba/TaskContextProxy.cpp @@ -35,16 +35,16 @@ * * ***************************************************************************/ -#include "TaskContextProxy.hpp" -#include "TaskContextServer.hpp" +#include "rtt/transports/corba/TaskContextProxy.hpp" +#include "rtt/transports/corba/TaskContextServer.hpp" #include "TaskContextC.h" -#include "CorbaOperationCallerFactory.hpp" -#include "CorbaLib.hpp" -#include "OperationCallerProxy.hpp" +#include "rtt/transports/corba/CorbaOperationCallerFactory.hpp" +#include "rtt/transports/corba/CorbaLib.hpp" +#include "rtt/transports/corba/OperationCallerProxy.hpp" -#include "../../types/Types.hpp" -#include "../../extras/SequentialActivity.hpp" -#include "corba.h" +#include "rtt/types/Types.hpp" +#include "rtt/extras/SequentialActivity.hpp" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO #include "tao/TimeBaseC.h" #include "tao/Messaging/Messaging.h" @@ -58,7 +58,7 @@ #include #include -#include "RemotePorts.hpp" +#include "rtt/transports/corba/RemotePorts.hpp" using namespace std; using namespace RTT::detail; diff --git a/rtt/transports/corba/TaskContextProxy.hpp b/rtt/transports/corba/TaskContextProxy.hpp index c3929a73d..3a34ac803 100644 --- a/rtt/transports/corba/TaskContextProxy.hpp +++ b/rtt/transports/corba/TaskContextProxy.hpp @@ -42,19 +42,19 @@ #ifndef _REENTRANT #define _REENTRANT #endif -#include "corba.h" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO -#include "corba.h" +#include "rtt/transports/corba/corba.h" #else #include #endif #include -#include "../../TaskContext.hpp" +#include "rtt/TaskContext.hpp" #include #include #include "TaskContextC.h" -#include "ApplicationServer.hpp" +#include "rtt/transports/corba/ApplicationServer.hpp" #include namespace RTT diff --git a/rtt/transports/corba/TaskContextServer.cpp b/rtt/transports/corba/TaskContextServer.cpp index e6c26da6a..47ad69ccf 100644 --- a/rtt/transports/corba/TaskContextServer.cpp +++ b/rtt/transports/corba/TaskContextServer.cpp @@ -37,9 +37,9 @@ -#include "TaskContextServer.hpp" -#include "TaskContextProxy.hpp" -#include "corba.h" +#include "rtt/transports/corba/TaskContextServer.hpp" +#include "rtt/transports/corba/TaskContextProxy.hpp" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO #include "TaskContextS.h" #include @@ -52,15 +52,15 @@ #include #endif #include "TaskContextC.h" -#include "TaskContextI.h" -#include "DataFlowI.h" -#include "POAUtility.h" +#include "rtt/transports/corba/TaskContextI.h" +#include "rtt/transports/corba/DataFlowI.h" +#include "rtt/transports/corba/POAUtility.h" #include #include -#include "../../os/threads.hpp" -#include "../../Activity.hpp" -#include "../../types/GlobalsRepository.hpp" +#include "rtt/os/threads.hpp" +#include "rtt/Activity.hpp" +#include "rtt/types/GlobalsRepository.hpp" namespace RTT {namespace corba diff --git a/rtt/transports/corba/TaskContextServer.hpp b/rtt/transports/corba/TaskContextServer.hpp index 24c5bfafd..018c51468 100644 --- a/rtt/transports/corba/TaskContextServer.hpp +++ b/rtt/transports/corba/TaskContextServer.hpp @@ -42,15 +42,15 @@ #ifndef _REENTRANT #define _REENTRANT #endif -#include "corba.h" +#include "rtt/transports/corba/corba.h" #ifdef CORBA_IS_TAO #include "TaskContextS.h" #else #include "TaskContextC.h" #endif -#include "../../TaskContext.hpp" -#include "ApplicationServer.hpp" -#include "../../base/ActivityInterface.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/transports/corba/ApplicationServer.hpp" +#include "rtt/base/ActivityInterface.hpp" class RTT_corba_CTaskContext_i; namespace RTT diff --git a/rtt/transports/corba/TransportPlugin.hpp b/rtt/transports/corba/TransportPlugin.hpp index 6875c6d01..714748ba6 100644 --- a/rtt/transports/corba/TransportPlugin.hpp +++ b/rtt/transports/corba/TransportPlugin.hpp @@ -39,7 +39,7 @@ #ifndef RTT_TRANSPORT_CORBA_PLUGIN #define RTT_TRANSPORT_CORBA_PLUGIN -#include +#include "rtt/types/TransportPlugin.hpp" namespace RTT { diff --git a/rtt/transports/corba/rtt-corba-config.h.in b/rtt/transports/corba/rtt-corba-config.h.in index f4e622a69..bed5b6352 100644 --- a/rtt/transports/corba/rtt-corba-config.h.in +++ b/rtt/transports/corba/rtt-corba-config.h.in @@ -40,7 +40,7 @@ #ifndef RTT_CORBA_CONFIG_H #define RTT_CORBA_CONFIG_H -#include "../../rtt-config.h" +#include "rtt/rtt-config.h" #define RTT_CORBA_IMPLEMENTATION @CORBA_IMPLEMENTATION@ @@ -88,11 +88,11 @@ # if defined(RTT_CORBA_DLL_EXPORT) # define RTT_CORBA_API __declspec(dllexport) # define RTT_CORBA_EXPORT __declspec(dllexport) -# define RTT_CORBA_HIDE +# define RTT_CORBA_HIDE # else # define RTT_CORBA_API __declspec(dllimport) # define RTT_CORBA_EXPORT __declspec(dllexport) -# define RTT_CORBA_HIDE +# define RTT_CORBA_HIDE # endif # else # define RTT_CORBA_API diff --git a/rtt/transports/mqueue/Dispatcher.cpp b/rtt/transports/mqueue/Dispatcher.cpp index 725ba5990..f7e581d4a 100644 --- a/rtt/transports/mqueue/Dispatcher.cpp +++ b/rtt/transports/mqueue/Dispatcher.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "Dispatcher.hpp" +#include "rtt/transports/mqueue/Dispatcher.hpp" namespace RTT { namespace mqueue { diff --git a/rtt/transports/mqueue/Dispatcher.hpp b/rtt/transports/mqueue/Dispatcher.hpp index 7276f6e25..f40c0d917 100644 --- a/rtt/transports/mqueue/Dispatcher.hpp +++ b/rtt/transports/mqueue/Dispatcher.hpp @@ -37,10 +37,10 @@ -#include "../../os/MutexLock.hpp" -#include "../../Activity.hpp" -#include "../../base/ChannelElementBase.hpp" -#include "../../Logger.hpp" +#include "rtt/os/MutexLock.hpp" +#include "rtt/Activity.hpp" +#include "rtt/base/ChannelElementBase.hpp" +#include "rtt/Logger.hpp" #include #include #include diff --git a/rtt/transports/mqueue/MQChannelElement.hpp b/rtt/transports/mqueue/MQChannelElement.hpp index ebaf965d6..797b09940 100644 --- a/rtt/transports/mqueue/MQChannelElement.hpp +++ b/rtt/transports/mqueue/MQChannelElement.hpp @@ -39,11 +39,11 @@ #ifndef MQ_CHANNEL_ELEMENT_H #define MQ_CHANNEL_ELEMENT_H -#include "MQSendRecv.hpp" -#include "../../Logger.hpp" -#include "../../base/ChannelElement.hpp" -#include "../../internal/DataSource.hpp" -#include "../../internal/DataSources.hpp" +#include "rtt/transports/mqueue/MQSendRecv.hpp" +#include "rtt/Logger.hpp" +#include "rtt/base/ChannelElement.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/internal/DataSources.hpp" #include namespace RTT diff --git a/rtt/transports/mqueue/MQLib.cpp b/rtt/transports/mqueue/MQLib.cpp index 3428bec72..31985d607 100644 --- a/rtt/transports/mqueue/MQLib.cpp +++ b/rtt/transports/mqueue/MQLib.cpp @@ -37,11 +37,11 @@ -#include "MQLib.hpp" -#include "MQTemplateProtocol.hpp" -#include "MQSerializationProtocol.hpp" -#include "../../types/TransportPlugin.hpp" -#include "../../types/TypekitPlugin.hpp" +#include "rtt/transports/mqueue/MQLib.hpp" +#include "rtt/transports/mqueue/MQTemplateProtocol.hpp" +#include "rtt/transports/mqueue/MQSerializationProtocol.hpp" +#include "rtt/types/TransportPlugin.hpp" +#include "rtt/types/TypekitPlugin.hpp" #include using namespace std; diff --git a/rtt/transports/mqueue/MQLib.hpp b/rtt/transports/mqueue/MQLib.hpp index 30de1d332..dfc20e7f8 100644 --- a/rtt/transports/mqueue/MQLib.hpp +++ b/rtt/transports/mqueue/MQLib.hpp @@ -40,7 +40,7 @@ #include "rtt-mqueue-config.h" #include -#include +#include "rtt/types/TransportPlugin.hpp" namespace RTT { namespace mqueue { diff --git a/rtt/transports/mqueue/MQSendRecv.cpp b/rtt/transports/mqueue/MQSendRecv.cpp index 195a847ad..a00a3d38c 100644 --- a/rtt/transports/mqueue/MQSendRecv.cpp +++ b/rtt/transports/mqueue/MQSendRecv.cpp @@ -47,14 +47,14 @@ #include #include -#include "MQSendRecv.hpp" -#include "../../types/TypeTransporter.hpp" -#include "../../types/TypeMarshaller.hpp" -#include "../../Logger.hpp" -#include "Dispatcher.hpp" -#include "../../base/PortInterface.hpp" -#include "../../DataFlowInterface.hpp" -#include "../../TaskContext.hpp" +#include "rtt/transports/mqueue/MQSendRecv.hpp" +#include "rtt/types/TypeTransporter.hpp" +#include "rtt/types/TypeMarshaller.hpp" +#include "rtt/Logger.hpp" +#include "rtt/transports/mqueue/Dispatcher.hpp" +#include "rtt/base/PortInterface.hpp" +#include "rtt/DataFlowInterface.hpp" +#include "rtt/TaskContext.hpp" using namespace RTT; using namespace RTT::detail; diff --git a/rtt/transports/mqueue/MQSendRecv.hpp b/rtt/transports/mqueue/MQSendRecv.hpp index ebea335c8..9a262addd 100644 --- a/rtt/transports/mqueue/MQSendRecv.hpp +++ b/rtt/transports/mqueue/MQSendRecv.hpp @@ -40,8 +40,8 @@ #define ORO_MQSENDER_HPP_ #include -#include "../../rtt-fwd.hpp" -#include "../../base/DataSourceBase.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/base/DataSourceBase.hpp" namespace RTT { diff --git a/rtt/transports/mqueue/MQSerializationProtocol.hpp b/rtt/transports/mqueue/MQSerializationProtocol.hpp index 217951227..94c646664 100644 --- a/rtt/transports/mqueue/MQSerializationProtocol.hpp +++ b/rtt/transports/mqueue/MQSerializationProtocol.hpp @@ -46,8 +46,8 @@ #ifndef MQSERIALIZATIONPROTOCOL_HPP_ #define MQSERIALIZATIONPROTOCOL_HPP_ -#include "MQTemplateProtocolBase.hpp" -#include "binary_data_archive.hpp" +#include "rtt/transports/mqueue/MQTemplateProtocolBase.hpp" +#include "rtt/transports/mqueue/binary_data_archive.hpp" #include #include #include diff --git a/rtt/transports/mqueue/MQTemplateProtocol.hpp b/rtt/transports/mqueue/MQTemplateProtocol.hpp index f4fce1991..196919e0d 100644 --- a/rtt/transports/mqueue/MQTemplateProtocol.hpp +++ b/rtt/transports/mqueue/MQTemplateProtocol.hpp @@ -39,10 +39,10 @@ #ifndef ORO_MQ_TEMPATE_PROTOCOL_HPP #define ORO_MQ_TEMPATE_PROTOCOL_HPP -#include "MQLib.hpp" -#include "../../types/TypeMarshaller.hpp" -#include "MQChannelElement.hpp" -#include "MQTemplateProtocolBase.hpp" +#include "rtt/transports/mqueue/MQLib.hpp" +#include "rtt/types/TypeMarshaller.hpp" +#include "rtt/transports/mqueue/MQChannelElement.hpp" +#include "rtt/transports/mqueue/MQTemplateProtocolBase.hpp" #include #include diff --git a/rtt/transports/mqueue/MQTemplateProtocolBase.hpp b/rtt/transports/mqueue/MQTemplateProtocolBase.hpp index 955aec495..3d5290943 100644 --- a/rtt/transports/mqueue/MQTemplateProtocolBase.hpp +++ b/rtt/transports/mqueue/MQTemplateProtocolBase.hpp @@ -39,9 +39,9 @@ #ifndef ORO_MQ_TEMPATE_PROTOCOL_BASE_HPP #define ORO_MQ_TEMPATE_PROTOCOL_BASE_HPP -#include "MQLib.hpp" -#include "../../types/TypeMarshaller.hpp" -#include "MQChannelElement.hpp" +#include "rtt/transports/mqueue/MQLib.hpp" +#include "rtt/types/TypeMarshaller.hpp" +#include "rtt/transports/mqueue/MQChannelElement.hpp" #include #include diff --git a/rtt/transports/mqueue/TransportPlugin.hpp b/rtt/transports/mqueue/TransportPlugin.hpp index c3e87a82d..d06982fa1 100644 --- a/rtt/transports/mqueue/TransportPlugin.hpp +++ b/rtt/transports/mqueue/TransportPlugin.hpp @@ -39,7 +39,7 @@ #ifndef RTT_TRANSPORT_MQUEUE_PLUGIN #define RTT_TRANSPORT_MQUEUE_PLUGIN -#include +#include "rtt/types/TransportPlugin.hpp" namespace RTT { diff --git a/rtt/typekit/BoolTypeInfo.hpp b/rtt/typekit/BoolTypeInfo.hpp index 677ff52bd..7e0f1bd3e 100644 --- a/rtt/typekit/BoolTypeInfo.hpp +++ b/rtt/typekit/BoolTypeInfo.hpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "../types/Types.hpp" -#include "StdTypeInfo.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/typekit/StdTypeInfo.hpp" #include #include diff --git a/rtt/typekit/ConnPolicyType.hpp b/rtt/typekit/ConnPolicyType.hpp index 3174feace..b583d2ca9 100644 --- a/rtt/typekit/ConnPolicyType.hpp +++ b/rtt/typekit/ConnPolicyType.hpp @@ -40,7 +40,7 @@ #define ORO_CONNPOLICYTYPE_HPP_ #include -#include "../ConnPolicy.hpp" +#include "rtt/ConnPolicy.hpp" namespace boost { namespace serialization { diff --git a/rtt/typekit/RTStringTypeInfo.hpp b/rtt/typekit/RTStringTypeInfo.hpp index 8a47f39d8..58928b758 100644 --- a/rtt/typekit/RTStringTypeInfo.hpp +++ b/rtt/typekit/RTStringTypeInfo.hpp @@ -36,9 +36,9 @@ ***************************************************************************/ -#include "../rt_string.hpp" -#include "../types/SequenceTypeInfo.hpp" -#include "../types/TemplateTypeInfo.hpp" +#include "rtt/rt_string.hpp" +#include "rtt/types/SequenceTypeInfo.hpp" +#include "rtt/types/TemplateTypeInfo.hpp" namespace RTT { diff --git a/rtt/typekit/RTTTypes.hpp b/rtt/typekit/RTTTypes.hpp index c4a966b95..5c88fbadb 100644 --- a/rtt/typekit/RTTTypes.hpp +++ b/rtt/typekit/RTTTypes.hpp @@ -44,11 +44,11 @@ #ifndef RTT_PURE_TYPEKIT_TYPES_HPP -#include "../ConnPolicy.hpp" -#include "../SendStatus.hpp" -#include "../FlowStatus.hpp" -#include "../PropertyBag.hpp" -#include "rtt-typekit-config.h" +#include "rtt/ConnPolicy.hpp" +#include "rtt/SendStatus.hpp" +#include "rtt/FlowStatus.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/typekit/rtt-typekit-config.h" // Disable extern template warning on MSVC #if !defined( __MINGW__ ) && defined( WIN32 ) diff --git a/rtt/typekit/RealTimeTypekit.cpp b/rtt/typekit/RealTimeTypekit.cpp index 398b0567f..0216094df 100644 --- a/rtt/typekit/RealTimeTypekit.cpp +++ b/rtt/typekit/RealTimeTypekit.cpp @@ -37,8 +37,8 @@ -#include "rtt-typekit-config.h" -#include "RealTimeTypekit.hpp" +#include "rtt/typekit/rtt-typekit-config.h" +#include "rtt/typekit/RealTimeTypekit.hpp" namespace RTT { diff --git a/rtt/typekit/RealTimeTypekit.hpp b/rtt/typekit/RealTimeTypekit.hpp index e3a920ecc..70e4beee2 100644 --- a/rtt/typekit/RealTimeTypekit.hpp +++ b/rtt/typekit/RealTimeTypekit.hpp @@ -39,8 +39,8 @@ #ifndef ORO_REALTIME_TYPEKIT_HPP #define ORO_REALTIME_TYPEKIT_HPP -#include "rtt-typekit-config.h" -#include "../types/TypekitPlugin.hpp" +#include "rtt/typekit/rtt-typekit-config.h" +#include "rtt/types/TypekitPlugin.hpp" namespace RTT { namespace types { diff --git a/rtt/typekit/RealTimeTypekitConstructors.cpp b/rtt/typekit/RealTimeTypekitConstructors.cpp index 7e342bd59..5a0cd073d 100644 --- a/rtt/typekit/RealTimeTypekitConstructors.cpp +++ b/rtt/typekit/RealTimeTypekitConstructors.cpp @@ -37,17 +37,17 @@ -#include "rtt-typekit-config.h" -#include "RealTimeTypekit.hpp" -#include "../types/Types.hpp" -#include "../FlowStatus.hpp" -#include "../internal/DataSources.hpp" -#include "../typekit/Types.hpp" -#include "../rtt-fwd.hpp" -#include "../internal/mystd.hpp" -#include "../types/TemplateConstructor.hpp" +#include "rtt/typekit/rtt-typekit-config.h" +#include "rtt/typekit/RealTimeTypekit.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/FlowStatus.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/typekit/Types.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/internal/mystd.hpp" +#include "rtt/types/TemplateConstructor.hpp" #ifdef OS_RT_MALLOC -#include "../rt_string.hpp" +#include "rtt/rt_string.hpp" #endif namespace RTT diff --git a/rtt/typekit/RealTimeTypekitGlobals.cpp b/rtt/typekit/RealTimeTypekitGlobals.cpp index f2626307f..e549e04f3 100644 --- a/rtt/typekit/RealTimeTypekitGlobals.cpp +++ b/rtt/typekit/RealTimeTypekitGlobals.cpp @@ -36,16 +36,16 @@ ***************************************************************************/ -#include "rtt-typekit-config.h" -#include "RealTimeTypekit.hpp" -#include "../types/Types.hpp" -#include "../types/GlobalsRepository.hpp" -#include "../FlowStatus.hpp" -#include "../SendStatus.hpp" -#include "../ConnPolicy.hpp" -#include "../BufferPolicy.hpp" -#include "../typekit/Types.hpp" -#include "../os/fosi.h" +#include "rtt/typekit/rtt-typekit-config.h" +#include "rtt/typekit/RealTimeTypekit.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/types/GlobalsRepository.hpp" +#include "rtt/FlowStatus.hpp" +#include "rtt/SendStatus.hpp" +#include "rtt/ConnPolicy.hpp" +#include "rtt/BufferPolicy.hpp" +#include "rtt/typekit/Types.hpp" +#include "rtt/os/fosi.h" namespace RTT { diff --git a/rtt/typekit/RealTimeTypekitOperators.cpp b/rtt/typekit/RealTimeTypekitOperators.cpp index de3a74dce..9b8a5f8d7 100644 --- a/rtt/typekit/RealTimeTypekitOperators.cpp +++ b/rtt/typekit/RealTimeTypekitOperators.cpp @@ -37,21 +37,21 @@ -#include "rtt-typekit-config.h" -#include "RealTimeTypekit.hpp" -#include "../types/Types.hpp" -#include "../types/Operators.hpp" -#include "../types/OperatorTypes.hpp" -#include "../internal/mystd.hpp" -#include "../rtt-fwd.hpp" -#include "../FlowStatus.hpp" -#include "../SendStatus.hpp" -#include "../ConnPolicy.hpp" -#include "../typekit/Types.hpp" +#include "rtt/typekit/rtt-typekit-config.h" +#include "rtt/typekit/RealTimeTypekit.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/types/Operators.hpp" +#include "rtt/types/OperatorTypes.hpp" +#include "rtt/internal/mystd.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/FlowStatus.hpp" +#include "rtt/SendStatus.hpp" +#include "rtt/ConnPolicy.hpp" +#include "rtt/typekit/Types.hpp" #include #include #ifdef OS_RT_MALLOC -#include "../rt_string.hpp" +#include "rtt/rt_string.hpp" #endif namespace RTT diff --git a/rtt/typekit/RealTimeTypekitStdTypes.cpp b/rtt/typekit/RealTimeTypekitStdTypes.cpp index ee33f5889..e03f0bef2 100644 --- a/rtt/typekit/RealTimeTypekitStdTypes.cpp +++ b/rtt/typekit/RealTimeTypekitStdTypes.cpp @@ -36,14 +36,14 @@ ***************************************************************************/ -#include "rtt-typekit-config.h" +#include "rtt/typekit/rtt-typekit-config.h" -#include "RealTimeTypekit.hpp" +#include "rtt/typekit/RealTimeTypekit.hpp" #ifndef RTT_NO_STD_TYPES -#include "StdStringTypeInfo.hpp" +#include "rtt/typekit/StdStringTypeInfo.hpp" #endif #ifdef OS_RT_MALLOC -#include "RTStringTypeInfo.hpp" +#include "rtt/typekit/RTStringTypeInfo.hpp" #endif namespace RTT diff --git a/rtt/typekit/RealTimeTypekitTypes.cpp b/rtt/typekit/RealTimeTypekitTypes.cpp index 72612ee32..6ba11b558 100644 --- a/rtt/typekit/RealTimeTypekitTypes.cpp +++ b/rtt/typekit/RealTimeTypekitTypes.cpp @@ -36,15 +36,15 @@ ***************************************************************************/ -#include "rtt-typekit-config.h" +#include "rtt/typekit/rtt-typekit-config.h" // This include must be as soon as possible in order to avoid a gcc // compiler warning about visibility. -#include "Types.inc" +#include "rtt/typekit/Types.inc" -#include "RealTimeTypekit.hpp" -#include "StdTypeInfo.hpp" -#include "BoolTypeInfo.hpp" -#include "../types/TypeInfoName.hpp" +#include "rtt/typekit/RealTimeTypekit.hpp" +#include "rtt/typekit/StdTypeInfo.hpp" +#include "rtt/typekit/BoolTypeInfo.hpp" +#include "rtt/types/TypeInfoName.hpp" namespace RTT diff --git a/rtt/typekit/RealTimeTypekitTypes2.cpp b/rtt/typekit/RealTimeTypekitTypes2.cpp index 60d9a7879..d1fa25089 100644 --- a/rtt/typekit/RealTimeTypekitTypes2.cpp +++ b/rtt/typekit/RealTimeTypekitTypes2.cpp @@ -37,21 +37,21 @@ -#include "rtt-typekit-config.h" -#include "Types2.inc" -#include "RealTimeTypekit.hpp" -#include "../types/Types.hpp" -#include "../types/TypeInfoName.hpp" -#include "../types/TemplateTypeInfo.hpp" -#include "../types/SequenceTypeInfo.hpp" -#include "StdTypeInfo.hpp" -#include "../types/StructTypeInfo.hpp" +#include "rtt/typekit/rtt-typekit-config.h" +#include "rtt/typekit/Types2.inc" +#include "rtt/typekit/RealTimeTypekit.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/types/TypeInfoName.hpp" +#include "rtt/types/TemplateTypeInfo.hpp" +#include "rtt/types/SequenceTypeInfo.hpp" +#include "rtt/typekit/StdTypeInfo.hpp" +#include "rtt/types/StructTypeInfo.hpp" -#include "../rtt-fwd.hpp" -#include "../FlowStatus.hpp" -#include "../ConnPolicy.hpp" -#include "ConnPolicyType.hpp" -#include "TaskContext.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/FlowStatus.hpp" +#include "rtt/ConnPolicy.hpp" +#include "rtt/typekit/ConnPolicyType.hpp" +#include "rtt/TaskContext.hpp" namespace RTT { diff --git a/rtt/typekit/StdStringTypeInfo.hpp b/rtt/typekit/StdStringTypeInfo.hpp index 046240ae9..e5168c4f4 100644 --- a/rtt/typekit/StdStringTypeInfo.hpp +++ b/rtt/typekit/StdStringTypeInfo.hpp @@ -37,8 +37,8 @@ #include -#include "../types/SequenceTypeInfo.hpp" -#include "../types/TemplateTypeInfo.hpp" +#include "rtt/types/SequenceTypeInfo.hpp" +#include "rtt/types/TemplateTypeInfo.hpp" namespace RTT { diff --git a/rtt/typekit/StdTypeInfo.hpp b/rtt/typekit/StdTypeInfo.hpp index 1c238a6da..efbd91773 100644 --- a/rtt/typekit/StdTypeInfo.hpp +++ b/rtt/typekit/StdTypeInfo.hpp @@ -39,9 +39,9 @@ #ifndef ORO_STD_TYPE_INFO_HPP #define ORO_STD_TYPE_INFO_HPP -#include "../rtt-config.h" -#include "../types/Types.hpp" -#include "../types/TemplateTypeInfo.hpp" +#include "rtt/rtt-config.h" +#include "rtt/types/Types.hpp" +#include "rtt/types/TemplateTypeInfo.hpp" namespace RTT { diff --git a/rtt/typekit/StdVectorTypeInfo.hpp b/rtt/typekit/StdVectorTypeInfo.hpp index df93812b2..eb83ff3f9 100644 --- a/rtt/typekit/StdVectorTypeInfo.hpp +++ b/rtt/typekit/StdVectorTypeInfo.hpp @@ -37,10 +37,10 @@ #include -#include "../types/TypeStream.hpp" -#include "../types/SequenceTypeInfo.hpp" -#include "../types/VectorComposition.hpp" -#include "../types/TemplateTypeInfo.hpp" +#include "rtt/types/TypeStream.hpp" +#include "rtt/types/SequenceTypeInfo.hpp" +#include "rtt/types/VectorComposition.hpp" +#include "rtt/types/TemplateTypeInfo.hpp" namespace RTT { diff --git a/rtt/typekit/Types.hpp b/rtt/typekit/Types.hpp index ccccf7fc2..540007f10 100644 --- a/rtt/typekit/Types.hpp +++ b/rtt/typekit/Types.hpp @@ -46,9 +46,9 @@ #ifndef RTT_TYPEKIT_TYPES //#define RTT_TYPEKIT_TYPES -#include "rtt-typekit-config.h" -#include "RTTTypes.hpp" -#include +#include "rtt/typekit/rtt-typekit-config.h" +#include "rtt/typekit/RTTTypes.hpp" +#include "rtt/rt_string.hpp" #include #include diff --git a/rtt/typekit/Types.inc b/rtt/typekit/Types.inc index 07fcf9cf7..907f6b684 100644 --- a/rtt/typekit/Types.inc +++ b/rtt/typekit/Types.inc @@ -36,19 +36,19 @@ ***************************************************************************/ -#include "../internal/DataSource.hpp" -#include "../internal/DataSources.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/internal/DataSources.hpp" -#include "../InputPort.hpp" -#include "../OutputPort.hpp" -#include "../Attribute.hpp" -#include "../Property.hpp" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/Property.hpp" namespace RTT { - template class RTT_EXPORT OutputPort< bool >; - template class RTT_EXPORT InputPort< bool >; - template class RTT_EXPORT Property< bool >; - template class RTT_EXPORT Attribute< bool >; + template class RTT_EXPORT OutputPort< bool >; + template class RTT_EXPORT InputPort< bool >; + template class RTT_EXPORT Property< bool >; + template class RTT_EXPORT Attribute< bool >; template class RTT_EXPORT OutputPort< std::string >; template class RTT_EXPORT InputPort< std::string >; @@ -78,7 +78,7 @@ RTT_EXPORT_TEMPLATE_TYPE(unsigned long long) RTT_EXPORT_TEMPLATE_TYPE(float) RTT_EXPORT_TEMPLATE_TYPE(char) -#include +#include "rtt/rt_string.hpp" RTT_EXPORT_TEMPLATE_TYPE(RTT::rt_string) diff --git a/rtt/typekit/Types2.inc b/rtt/typekit/Types2.inc index 4c91e36ba..00430d334 100644 --- a/rtt/typekit/Types2.inc +++ b/rtt/typekit/Types2.inc @@ -40,16 +40,16 @@ // bool needs a special treatment, since the GCC compiler already // instantiates it when it sees a line like DataSource::shared_ptr... // So we need to put it before the ports/Operations code which contains lots of these. -#include "../internal/DataSource.hpp" -#include "../SendStatus.hpp" +#include "rtt/internal/DataSource.hpp" +#include "rtt/SendStatus.hpp" namespace RTT { namespace internal { template class RTT_EXPORT DataSource< RTT::SendStatus >; }} -#include "../InputPort.hpp" -#include "../OutputPort.hpp" -#include "../Attribute.hpp" -#include "../Property.hpp" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/Property.hpp" diff --git a/rtt/typekit/rtt-typekit-config.h.in b/rtt/typekit/rtt-typekit-config.h.in index 68ff1be2a..a795a4d8e 100644 --- a/rtt/typekit/rtt-typekit-config.h.in +++ b/rtt/typekit/rtt-typekit-config.h.in @@ -39,7 +39,7 @@ #ifndef RTT_TYPEKIT_CONFIG_H #define RTT_TYPEKIT_CONFIG_H -#include "../rtt-config.h" +#include "rtt/rtt-config.h" // // See: @@ -70,12 +70,12 @@ # if defined(RTT_TYPEKIT_DLL_EXPORT) # define RTT_TYPEKIT_API __declspec(dllexport) # define RTT_TYPEKIT_EXPORT __declspec(dllexport) -# define RTT_TYPEKIT_HIDE +# define RTT_TYPEKIT_HIDE # define RTT_TYPEKIT_EXT_TMPL extern # else # define RTT_TYPEKIT_API __declspec(dllimport) # define RTT_TYPEKIT_EXPORT __declspec(dllexport) -# define RTT_TYPEKIT_HIDE +# define RTT_TYPEKIT_HIDE # define RTT_TYPEKIT_EXT_TMPL extern # endif # else diff --git a/rtt/types/BoostArrayTypeInfo.hpp b/rtt/types/BoostArrayTypeInfo.hpp index 1bc2fa7ee..d29a8f0d1 100644 --- a/rtt/types/BoostArrayTypeInfo.hpp +++ b/rtt/types/BoostArrayTypeInfo.hpp @@ -39,15 +39,15 @@ #ifndef ORO_TEMPLATE_BOOSTARRAY_INFO_HPP #define ORO_TEMPLATE_BOOSTARRAY_INFO_HPP -#include "PrimitiveTypeInfo.hpp" -#include "../internal/ArrayPartDataSource.hpp" -#include "type_discovery.hpp" +#include "rtt/types/PrimitiveTypeInfo.hpp" +#include "rtt/internal/ArrayPartDataSource.hpp" +#include "rtt/types/type_discovery.hpp" #include #include -#include "PropertyComposition.hpp" -#include "PropertyDecomposition.hpp" -#include "CompositionFactory.hpp" -#include "MemberFactory.hpp" +#include "rtt/types/PropertyComposition.hpp" +#include "rtt/types/PropertyDecomposition.hpp" +#include "rtt/types/CompositionFactory.hpp" +#include "rtt/types/MemberFactory.hpp" namespace RTT { diff --git a/rtt/types/CArrayTypeInfo.hpp b/rtt/types/CArrayTypeInfo.hpp index a48065503..36c80e660 100644 --- a/rtt/types/CArrayTypeInfo.hpp +++ b/rtt/types/CArrayTypeInfo.hpp @@ -39,13 +39,13 @@ #ifndef ORO_TEMPLATE_CARRAY_INFO_HPP #define ORO_TEMPLATE_CARRAY_INFO_HPP -#include "PrimitiveTypeInfo.hpp" -#include "../internal/ArrayPartDataSource.hpp" +#include "rtt/types/PrimitiveTypeInfo.hpp" +#include "rtt/internal/ArrayPartDataSource.hpp" #include -#include "carray.hpp" -#include "../internal/carray.hpp" -#include "PropertyComposition.hpp" -#include "PropertyDecomposition.hpp" +#include "rtt/types/carray.hpp" +#include "rtt/internal/carray.hpp" +#include "rtt/types/PropertyComposition.hpp" +#include "rtt/types/PropertyDecomposition.hpp" namespace RTT { diff --git a/rtt/types/CompositionFactory.cpp b/rtt/types/CompositionFactory.cpp index e1f8686f4..6ad10545c 100644 --- a/rtt/types/CompositionFactory.cpp +++ b/rtt/types/CompositionFactory.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "TemplateCompositionFactory.hpp" +#include "rtt/types/TemplateCompositionFactory.hpp" using namespace RTT; using namespace RTT::types; diff --git a/rtt/types/CompositionFactory.hpp b/rtt/types/CompositionFactory.hpp index 4338dfeb4..cfedaf328 100644 --- a/rtt/types/CompositionFactory.hpp +++ b/rtt/types/CompositionFactory.hpp @@ -39,7 +39,7 @@ #ifndef RTT__COMPOSITION_FACTORY_HPP #define RTT__COMPOSITION_FACTORY_HPP -#include "../base/DataSourceBase.hpp" +#include "rtt/base/DataSourceBase.hpp" namespace RTT { namespace types { diff --git a/rtt/types/EnumTypeInfo.hpp b/rtt/types/EnumTypeInfo.hpp index 2f59a8526..8a78d09ee 100644 --- a/rtt/types/EnumTypeInfo.hpp +++ b/rtt/types/EnumTypeInfo.hpp @@ -36,10 +36,10 @@ ***************************************************************************/ -#include "../rtt-config.h" -#include "Types.hpp" -#include "TemplateTypeInfo.hpp" -#include "TemplateConstructor.hpp" +#include "rtt/rtt-config.h" +#include "rtt/types/Types.hpp" +#include "rtt/types/TemplateTypeInfo.hpp" +#include "rtt/types/TemplateConstructor.hpp" namespace RTT { diff --git a/rtt/types/GlobalsRepository.cpp b/rtt/types/GlobalsRepository.cpp index 5419f306d..4fecc7ae5 100644 --- a/rtt/types/GlobalsRepository.cpp +++ b/rtt/types/GlobalsRepository.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "GlobalsRepository.hpp" +#include "rtt/types/GlobalsRepository.hpp" using namespace RTT::types; diff --git a/rtt/types/GlobalsRepository.hpp b/rtt/types/GlobalsRepository.hpp index 87c07b39b..9d39c601b 100644 --- a/rtt/types/GlobalsRepository.hpp +++ b/rtt/types/GlobalsRepository.hpp @@ -39,7 +39,7 @@ #ifndef ORO_GLOBALS_REPOSITORY_HPP #define ORO_GLOBALS_REPOSITORY_HPP -#include "../ConfigurationInterface.hpp" +#include "rtt/ConfigurationInterface.hpp" namespace RTT { namespace types { diff --git a/rtt/types/MemberFactory.cpp b/rtt/types/MemberFactory.cpp index 67ad6f636..5e173a070 100644 --- a/rtt/types/MemberFactory.cpp +++ b/rtt/types/MemberFactory.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "MemberFactory.hpp" -#include "../Logger.hpp" +#include "rtt/types/MemberFactory.hpp" +#include "rtt/Logger.hpp" using namespace std; using namespace RTT; diff --git a/rtt/types/MemberFactory.hpp b/rtt/types/MemberFactory.hpp index aff50d4d2..cb709435e 100644 --- a/rtt/types/MemberFactory.hpp +++ b/rtt/types/MemberFactory.hpp @@ -39,9 +39,9 @@ #ifndef ORO_MEMBER_FACTORY_HPP #define ORO_MEMBER_FACTORY_HPP -#include "../base/DataSourceBase.hpp" -#include "../rtt-config.h" -#include "../internal/Reference.hpp" +#include "rtt/base/DataSourceBase.hpp" +#include "rtt/rtt-config.h" +#include "rtt/internal/Reference.hpp" #include #include diff --git a/rtt/types/OperatorTypes.hpp b/rtt/types/OperatorTypes.hpp index 7041b025d..96e348669 100644 --- a/rtt/types/OperatorTypes.hpp +++ b/rtt/types/OperatorTypes.hpp @@ -39,8 +39,8 @@ #ifndef ORO_CORELIB_OPERATOP_TYPES_HPP #define ORO_CORELIB_OPERATOP_TYPES_HPP -#include "Operators.hpp" -#include "../internal/DataSources.hpp" +#include "rtt/types/Operators.hpp" +#include "rtt/internal/DataSources.hpp" #include namespace RTT diff --git a/rtt/types/Operators.cpp b/rtt/types/Operators.cpp index 378f746a3..77205fa51 100644 --- a/rtt/types/Operators.cpp +++ b/rtt/types/Operators.cpp @@ -35,20 +35,20 @@ * * ***************************************************************************/ -#include "Operators.hpp" -#include "OperatorTypes.hpp" +#include "rtt/types/Operators.hpp" +#include "rtt/types/OperatorTypes.hpp" #include // Cappellini Consonni Extension -#include "../extras/MultiVector.hpp" +#include "rtt/extras/MultiVector.hpp" -#include "../Logger.hpp" +#include "rtt/Logger.hpp" #include #include -#include "../internal/mystd.hpp" +#include "rtt/internal/mystd.hpp" -#include "../rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { diff --git a/rtt/types/Operators.hpp b/rtt/types/Operators.hpp index 79d7bc71f..81b8ef7af 100644 --- a/rtt/types/Operators.hpp +++ b/rtt/types/Operators.hpp @@ -40,7 +40,7 @@ #include #include -#include "../internal/DataSource.hpp" +#include "rtt/internal/DataSource.hpp" #include namespace RTT { namespace types diff --git a/rtt/types/PrimitiveSequenceTypeInfo.hpp b/rtt/types/PrimitiveSequenceTypeInfo.hpp index f68cad3ca..c5f52cb9b 100644 --- a/rtt/types/PrimitiveSequenceTypeInfo.hpp +++ b/rtt/types/PrimitiveSequenceTypeInfo.hpp @@ -39,9 +39,9 @@ #ifndef ORO_PRIMITIVE_SEQUENCE_TYPE_INFO_HPP #define ORO_PRIMITIVE_SEQUENCE_TYPE_INFO_HPP -#include "PrimitiveTypeInfo.hpp" -#include "SequenceTypeInfoBase.hpp" -#include "MemberFactory.hpp" +#include "rtt/types/PrimitiveTypeInfo.hpp" +#include "rtt/types/SequenceTypeInfoBase.hpp" +#include "rtt/types/MemberFactory.hpp" namespace RTT { diff --git a/rtt/types/PrimitiveTypeInfo.hpp b/rtt/types/PrimitiveTypeInfo.hpp index 4ff974931..3843d9625 100644 --- a/rtt/types/PrimitiveTypeInfo.hpp +++ b/rtt/types/PrimitiveTypeInfo.hpp @@ -39,15 +39,15 @@ #ifndef ORO_PRIMITIVE_TYPEINFO_HPP #define ORO_PRIMITIVE_TYPEINFO_HPP -#include "Types.hpp" -#include "../Property.hpp" -#include "../Attribute.hpp" -#include "../Logger.hpp" -#include "TypeStreamSelector.hpp" -#include "TypeInfoGenerator.hpp" -#include "StreamFactory.hpp" -#include "TemplateValueFactory.hpp" -#include "../rtt-config.h" +#include "rtt/types/Types.hpp" +#include "rtt/Property.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/Logger.hpp" +#include "rtt/types/TypeStreamSelector.hpp" +#include "rtt/types/TypeInfoGenerator.hpp" +#include "rtt/types/StreamFactory.hpp" +#include "rtt/types/TemplateValueFactory.hpp" +#include "rtt/rtt-config.h" namespace RTT { diff --git a/rtt/types/PropertyComposition.cpp b/rtt/types/PropertyComposition.cpp index 4f5047542..ec031db70 100644 --- a/rtt/types/PropertyComposition.cpp +++ b/rtt/types/PropertyComposition.cpp @@ -36,11 +36,11 @@ ***************************************************************************/ -#include "PropertyComposition.hpp" -#include "PropertyDecomposition.hpp" -#include "../Logger.hpp" -#include "../Property.hpp" -#include "types/Types.hpp" +#include "rtt/types/PropertyComposition.hpp" +#include "rtt/types/PropertyDecomposition.hpp" +#include "rtt/Logger.hpp" +#include "rtt/Property.hpp" +#include "rtt/types/Types.hpp" using namespace RTT; using namespace RTT::detail; diff --git a/rtt/types/PropertyComposition.hpp b/rtt/types/PropertyComposition.hpp index c9ad79222..d3cc416ff 100644 --- a/rtt/types/PropertyComposition.hpp +++ b/rtt/types/PropertyComposition.hpp @@ -39,8 +39,8 @@ #ifndef ORO_PROPERTYCOMPOSITION_HPP_ #define ORO_PROPERTYCOMPOSITION_HPP_ -#include "../base/PropertyBase.hpp" -#include "../PropertyBag.hpp" +#include "rtt/base/PropertyBase.hpp" +#include "rtt/PropertyBag.hpp" namespace RTT { namespace types { diff --git a/rtt/types/PropertyDecomposition.cpp b/rtt/types/PropertyDecomposition.cpp index 166fb0402..58242c1be 100644 --- a/rtt/types/PropertyDecomposition.cpp +++ b/rtt/types/PropertyDecomposition.cpp @@ -43,15 +43,15 @@ * Author: kaltan */ -#include "PropertyDecomposition.hpp" -#include "../internal/DataSource.hpp" +#include "rtt/types/PropertyDecomposition.hpp" +#include "rtt/internal/DataSource.hpp" #include #include #include #include -#include "../Logger.hpp" -#include "TypeInfo.hpp" -#include "../Property.hpp" +#include "rtt/Logger.hpp" +#include "rtt/types/TypeInfo.hpp" +#include "rtt/Property.hpp" using namespace std; diff --git a/rtt/types/PropertyDecomposition.hpp b/rtt/types/PropertyDecomposition.hpp index 21a9e623a..a3db03496 100644 --- a/rtt/types/PropertyDecomposition.hpp +++ b/rtt/types/PropertyDecomposition.hpp @@ -39,8 +39,8 @@ #ifndef ORO_PROPERTYDECOMPOSITION_HPP_ #define ORO_PROPERTYDECOMPOSITION_HPP_ -#include "../base/PropertyBase.hpp" -#include "../PropertyBag.hpp" +#include "rtt/base/PropertyBase.hpp" +#include "rtt/PropertyBag.hpp" namespace RTT { namespace types { diff --git a/rtt/types/SequenceConstructor.hpp b/rtt/types/SequenceConstructor.hpp index f96301c35..ae9b030a5 100644 --- a/rtt/types/SequenceConstructor.hpp +++ b/rtt/types/SequenceConstructor.hpp @@ -39,8 +39,8 @@ #ifndef SEQUENCECONSTRUCTOR_HPP_ #define SEQUENCECONSTRUCTOR_HPP_ -#include "TypeConstructor.hpp" -#include "../internal/DataSources.hpp" +#include "rtt/types/TypeConstructor.hpp" +#include "rtt/internal/DataSources.hpp" #include namespace RTT diff --git a/rtt/types/SequenceTypeInfo.hpp b/rtt/types/SequenceTypeInfo.hpp index 3a8db59d2..84d43a489 100644 --- a/rtt/types/SequenceTypeInfo.hpp +++ b/rtt/types/SequenceTypeInfo.hpp @@ -39,9 +39,9 @@ #ifndef ORO_SEQUENCE_TYPE_INFO_HPP #define ORO_SEQUENCE_TYPE_INFO_HPP -#include "TemplateTypeInfo.hpp" -#include "SequenceTypeInfoBase.hpp" -#include "MemberFactory.hpp" +#include "rtt/types/TemplateTypeInfo.hpp" +#include "rtt/types/SequenceTypeInfoBase.hpp" +#include "rtt/types/MemberFactory.hpp" namespace RTT { diff --git a/rtt/types/SequenceTypeInfoBase.cpp b/rtt/types/SequenceTypeInfoBase.cpp index e4ad7caf1..b5a1d78eb 100644 --- a/rtt/types/SequenceTypeInfoBase.cpp +++ b/rtt/types/SequenceTypeInfoBase.cpp @@ -36,7 +36,7 @@ ***************************************************************************/ -#include "SequenceTypeInfoBase.hpp" +#include "rtt/types/SequenceTypeInfoBase.hpp" namespace RTT { diff --git a/rtt/types/SequenceTypeInfoBase.hpp b/rtt/types/SequenceTypeInfoBase.hpp index baae942b1..34e423288 100644 --- a/rtt/types/SequenceTypeInfoBase.hpp +++ b/rtt/types/SequenceTypeInfoBase.hpp @@ -39,13 +39,13 @@ #ifndef ORO_SEQUENCE_TYPE_INFO_BASE_HPP #define ORO_SEQUENCE_TYPE_INFO_BASE_HPP -#include "SequenceConstructor.hpp" -#include "TemplateConstructor.hpp" -#include "PropertyComposition.hpp" -#include "VectorTemplateComposition.hpp" -#include "PropertyDecomposition.hpp" -#include "../internal/FusedFunctorDataSource.hpp" -#include "../internal/DataSourceGenerator.hpp" +#include "rtt/types/SequenceConstructor.hpp" +#include "rtt/types/TemplateConstructor.hpp" +#include "rtt/types/PropertyComposition.hpp" +#include "rtt/types/VectorTemplateComposition.hpp" +#include "rtt/types/PropertyDecomposition.hpp" +#include "rtt/internal/FusedFunctorDataSource.hpp" +#include "rtt/internal/DataSourceGenerator.hpp" #include namespace RTT diff --git a/rtt/types/StdVectorTemplateTypeInfo.hpp b/rtt/types/StdVectorTemplateTypeInfo.hpp index cecba5ee0..3049c8cfc 100644 --- a/rtt/types/StdVectorTemplateTypeInfo.hpp +++ b/rtt/types/StdVectorTemplateTypeInfo.hpp @@ -34,14 +34,14 @@ #ifndef STD_VECTOR_TEMPLATE_TYPE_INFO_HPP #define STD_VECTOR_TEMPLATE_TYPE_INFO_HPP -#include "../Property.hpp" -#include "../PropertyBag.hpp" -#include "SequenceTypeInfo.hpp" -#include "Types.hpp" -#include "../Logger.hpp" -#include "../internal/DataSources.hpp" +#include "rtt/Property.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/types/SequenceTypeInfo.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/Logger.hpp" +#include "rtt/internal/DataSources.hpp" #include -#include "VectorTemplateComposition.hpp" +#include "rtt/types/VectorTemplateComposition.hpp" namespace RTT { diff --git a/rtt/types/StreamFactory.cpp b/rtt/types/StreamFactory.cpp index 84b35053b..31a3470a5 100644 --- a/rtt/types/StreamFactory.cpp +++ b/rtt/types/StreamFactory.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "StreamFactory.hpp" -#include "../rtt-config.h" +#include "rtt/types/StreamFactory.hpp" +#include "rtt/rtt-config.h" using namespace std; using namespace RTT; diff --git a/rtt/types/StreamFactory.hpp b/rtt/types/StreamFactory.hpp index 800a33210..abc318d7f 100644 --- a/rtt/types/StreamFactory.hpp +++ b/rtt/types/StreamFactory.hpp @@ -41,10 +41,10 @@ #include #include -#include "../base/DataSourceBase.hpp" +#include "rtt/base/DataSourceBase.hpp" #include #include -#include "../rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { diff --git a/rtt/types/StructTypeInfo.hpp b/rtt/types/StructTypeInfo.hpp index 7134de8c0..6388063b7 100644 --- a/rtt/types/StructTypeInfo.hpp +++ b/rtt/types/StructTypeInfo.hpp @@ -39,10 +39,10 @@ #ifndef ORO_STRUCT_TYPE_INFO_HPP #define ORO_STRUCT_TYPE_INFO_HPP -#include "TemplateTypeInfo.hpp" -#include "PropertyDecomposition.hpp" -#include "type_discovery.hpp" -#include "MemberFactory.hpp" +#include "rtt/types/TemplateTypeInfo.hpp" +#include "rtt/types/PropertyDecomposition.hpp" +#include "rtt/types/type_discovery.hpp" +#include "rtt/types/MemberFactory.hpp" namespace RTT { diff --git a/rtt/types/TemplateCompositionFactory.hpp b/rtt/types/TemplateCompositionFactory.hpp index 2d6219630..f2d6cb7f1 100644 --- a/rtt/types/TemplateCompositionFactory.hpp +++ b/rtt/types/TemplateCompositionFactory.hpp @@ -39,9 +39,9 @@ #ifndef RTT_TEMPLATE_COMPOSITION_FACTORY_HPP #define RTT_TEMPLATE_COMPOSITION_FACTORY_HPP -#include "CompositionFactory.hpp" -#include "../Property.hpp" -#include "../PropertyBag.hpp" +#include "rtt/types/CompositionFactory.hpp" +#include "rtt/Property.hpp" +#include "rtt/PropertyBag.hpp" namespace RTT { namespace types { diff --git a/rtt/types/TemplateConnFactory.hpp b/rtt/types/TemplateConnFactory.hpp index 2b63c3db6..39f42d73a 100644 --- a/rtt/types/TemplateConnFactory.hpp +++ b/rtt/types/TemplateConnFactory.hpp @@ -40,11 +40,11 @@ #define ORO_TEMPLATE_CONN_FACTORY_HPP #include -#include "../internal/ConnFactory.hpp" +#include "rtt/internal/ConnFactory.hpp" -#include "../InputPort.hpp" -#include "../OutputPort.hpp" -#include "../Logger.hpp" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" +#include "rtt/Logger.hpp" namespace RTT { namespace types { diff --git a/rtt/types/TemplateConstructor.hpp b/rtt/types/TemplateConstructor.hpp index 35b533da9..b6b85528c 100644 --- a/rtt/types/TemplateConstructor.hpp +++ b/rtt/types/TemplateConstructor.hpp @@ -39,15 +39,15 @@ #ifndef ORO_TEMPLATE_CONSTRUCTOR_HPP #define ORO_TEMPLATE_CONSTRUCTOR_HPP -#include "Types.hpp" -#include "../internal/FusedFunctorDataSource.hpp" -#include "../internal/CreateSequence.hpp" -#include "../Logger.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/internal/FusedFunctorDataSource.hpp" +#include "rtt/internal/CreateSequence.hpp" +#include "rtt/Logger.hpp" #include #include -#include "../rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { diff --git a/rtt/types/TemplateTypeInfo.hpp b/rtt/types/TemplateTypeInfo.hpp index eb9f4e2e3..bfd752248 100644 --- a/rtt/types/TemplateTypeInfo.hpp +++ b/rtt/types/TemplateTypeInfo.hpp @@ -38,17 +38,17 @@ #ifndef ORO_TEMPLATE_TYPEINFO_HPP #define ORO_TEMPLATE_TYPEINFO_HPP -#include "Types.hpp" -#include "../Property.hpp" -#include "../Attribute.hpp" -#include "../Logger.hpp" -#include "../InputPort.hpp" -#include "../OutputPort.hpp" -#include "PrimitiveTypeInfo.hpp" -#include "TemplateConnFactory.hpp" -#include "TemplateCompositionFactory.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/Property.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/Logger.hpp" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" +#include "rtt/types/PrimitiveTypeInfo.hpp" +#include "rtt/types/TemplateConnFactory.hpp" +#include "rtt/types/TemplateCompositionFactory.hpp" -#include "../rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { diff --git a/rtt/types/TemplateValueFactory.hpp b/rtt/types/TemplateValueFactory.hpp index d053f2020..1750cdeed 100644 --- a/rtt/types/TemplateValueFactory.hpp +++ b/rtt/types/TemplateValueFactory.hpp @@ -39,11 +39,11 @@ #ifndef RTT_TEMPLATE_TYPE_FACTORY #define RTT_TEMPLATE_TYPE_FACTORY -#include "ValueFactory.hpp" -#include "../Property.hpp" -#include "../Attribute.hpp" -#include "../Logger.hpp" -#include "../rtt-config.h" +#include "rtt/types/ValueFactory.hpp" +#include "rtt/Property.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/Logger.hpp" +#include "rtt/rtt-config.h" namespace RTT { diff --git a/rtt/types/TransportPlugin.hpp b/rtt/types/TransportPlugin.hpp index e68c4035b..d46dc46fd 100644 --- a/rtt/types/TransportPlugin.hpp +++ b/rtt/types/TransportPlugin.hpp @@ -35,7 +35,7 @@ #define ORO_TRANSPORTPLUGIN_HPP 1 #include -#include "Types.hpp" +#include "rtt/types/Types.hpp" namespace RTT { namespace types { diff --git a/rtt/types/TypeConstructor.cpp b/rtt/types/TypeConstructor.cpp index 42c2e6ef5..5c64d2a00 100644 --- a/rtt/types/TypeConstructor.cpp +++ b/rtt/types/TypeConstructor.cpp @@ -37,7 +37,7 @@ -#include "TypeConstructor.hpp" +#include "rtt/types/TypeConstructor.hpp" namespace RTT { diff --git a/rtt/types/TypeConstructor.hpp b/rtt/types/TypeConstructor.hpp index de22bdc58..545b16ed7 100644 --- a/rtt/types/TypeConstructor.hpp +++ b/rtt/types/TypeConstructor.hpp @@ -39,7 +39,7 @@ #define ORO_CORELIB_TYPE_BUILDER_HPP #include -#include "../base/DataSourceBase.hpp" +#include "rtt/base/DataSourceBase.hpp" namespace RTT { namespace types { diff --git a/rtt/types/TypeInfo.cpp b/rtt/types/TypeInfo.cpp index a74c651fb..70e5467a4 100644 --- a/rtt/types/TypeInfo.cpp +++ b/rtt/types/TypeInfo.cpp @@ -36,16 +36,16 @@ ***************************************************************************/ -#include "TypeInfo.hpp" -#include "TypeConstructor.hpp" -#include "../internal/DataSourceTypeInfo.hpp" -#include "../internal/ConnFactory.hpp" -#include "TypeTransporter.hpp" +#include "rtt/types/TypeInfo.hpp" +#include "rtt/types/TypeConstructor.hpp" +#include "rtt/internal/DataSourceTypeInfo.hpp" +#include "rtt/internal/ConnFactory.hpp" +#include "rtt/types/TypeTransporter.hpp" -#include "rtt-config.h" +#include "rtt/rtt-config.h" -#include "../Logger.hpp" -#include "../base/AttributeBase.hpp" +#include "rtt/Logger.hpp" +#include "rtt/base/AttributeBase.hpp" namespace RTT { @@ -196,12 +196,12 @@ namespace RTT base::InputPortInterface* TypeInfo::inputPort(std::string const& name) const { - return mconnf ? mconnf->inputPort(name) : 0; + return mconnf ? mconnf->inputPort(name) : 0; } base::OutputPortInterface* TypeInfo::outputPort(std::string const& name) const { - return mconnf ? mconnf->outputPort(name) : 0; + return mconnf ? mconnf->outputPort(name) : 0; } base::ChannelElementBase::shared_ptr TypeInfo::buildDataStorage(ConnPolicy const& policy) const diff --git a/rtt/types/TypeInfo.hpp b/rtt/types/TypeInfo.hpp index 9dcff8806..0388f97bb 100644 --- a/rtt/types/TypeInfo.hpp +++ b/rtt/types/TypeInfo.hpp @@ -40,16 +40,16 @@ #include #include -#include "../base/DataSourceBase.hpp" -#include "../base/ChannelElementBase.hpp" -#include "../internal/SharedConnection.hpp" +#include "rtt/base/DataSourceBase.hpp" +#include "rtt/base/ChannelElementBase.hpp" +#include "rtt/internal/SharedConnection.hpp" #ifndef NO_TYPE_INFO_FACTORY_FUNCTIONS -#include "MemberFactory.hpp" -#include "ValueFactory.hpp" -#include "CompositionFactory.hpp" +#include "rtt/types/MemberFactory.hpp" +#include "rtt/types/ValueFactory.hpp" +#include "rtt/types/CompositionFactory.hpp" #ifndef NO_TYPE_INFO_STREAMS -#include "StreamFactory.hpp" +#include "rtt/types/StreamFactory.hpp" #endif #endif diff --git a/rtt/types/TypeInfoGenerator.hpp b/rtt/types/TypeInfoGenerator.hpp index ee1deced6..51fa30a26 100644 --- a/rtt/types/TypeInfoGenerator.hpp +++ b/rtt/types/TypeInfoGenerator.hpp @@ -40,8 +40,8 @@ #define RTT_TYPEINFO_GENERATOR_HPP #include -#include "../rtt-config.h" -#include "rtt-types-fwd.hpp" +#include "rtt/rtt-config.h" +#include "rtt/types/rtt-types-fwd.hpp" namespace RTT { diff --git a/rtt/types/TypeInfoName.hpp b/rtt/types/TypeInfoName.hpp index 231a89c5a..d87712546 100644 --- a/rtt/types/TypeInfoName.hpp +++ b/rtt/types/TypeInfoName.hpp @@ -39,11 +39,11 @@ #ifndef ORO_TYPEINFO_NAME_HPP #define ORO_TYPEINFO_NAME_HPP -#include "Types.hpp" -#include "TypeInfoGenerator.hpp" -#include "../internal/DataSourceTypeInfo.hpp" -#include "../Logger.hpp" -#include "../rtt-config.h" +#include "rtt/types/Types.hpp" +#include "rtt/types/TypeInfoGenerator.hpp" +#include "rtt/internal/DataSourceTypeInfo.hpp" +#include "rtt/Logger.hpp" +#include "rtt/rtt-config.h" namespace RTT { namespace types { diff --git a/rtt/types/TypeInfoRepository.cpp b/rtt/types/TypeInfoRepository.cpp index feaabf7a8..8e9c1b98b 100644 --- a/rtt/types/TypeInfoRepository.cpp +++ b/rtt/types/TypeInfoRepository.cpp @@ -36,15 +36,15 @@ ***************************************************************************/ -#include "TypeInfoRepository.hpp" +#include "rtt/types/TypeInfoRepository.hpp" -#include "rtt-config.h" +#include "rtt/rtt-config.h" -#include "../Logger.hpp" -#include "TypeTransporter.hpp" -#include "TransportPlugin.hpp" -#include "../internal/mystd.hpp" -#include "../internal/DataSourceTypeInfo.hpp" +#include "rtt/Logger.hpp" +#include "rtt/types/TypeTransporter.hpp" +#include "rtt/types/TransportPlugin.hpp" +#include "rtt/internal/mystd.hpp" +#include "rtt/internal/DataSourceTypeInfo.hpp" #include namespace RTT @@ -72,12 +72,12 @@ namespace RTT void TypeInfoRepository::Release() { typerepos.reset(); } - + void TypeInfoRepository::setAutoLoader(const boost::function &loader) { loadTypeKitForName = loader; } - + TypeInfo* TypeInfoRepository::typeInternal( const std::string& name ) const { MutexLock lock(type_lock); @@ -113,13 +113,13 @@ namespace RTT TypeInfo* TypeInfoRepository::type( const std::string& name ) const { TypeInfo *ret = typeInternal(name); - + if(!ret && loadTypeKitForName) { if(loadTypeKitForName(name)) ret = typeInternal(name); } - + return ret; } diff --git a/rtt/types/TypeInfoRepository.hpp b/rtt/types/TypeInfoRepository.hpp index 0f8cfeb53..30aa6c514 100644 --- a/rtt/types/TypeInfoRepository.hpp +++ b/rtt/types/TypeInfoRepository.hpp @@ -43,8 +43,8 @@ #include #include #include -#include "TypeInfo.hpp" -#include "TypeInfoGenerator.hpp" +#include "rtt/types/TypeInfo.hpp" +#include "rtt/types/TypeInfoGenerator.hpp" namespace RTT { namespace types { diff --git a/rtt/types/TypeMarshaller.hpp b/rtt/types/TypeMarshaller.hpp index f7d43f100..3e4cf31a1 100644 --- a/rtt/types/TypeMarshaller.hpp +++ b/rtt/types/TypeMarshaller.hpp @@ -46,7 +46,7 @@ #ifndef TYPEMARSHALLER_HPP_ #define TYPEMARSHALLER_HPP_ -#include "TypeTransporter.hpp" +#include "rtt/types/TypeTransporter.hpp" namespace RTT { diff --git a/rtt/types/TypeStream-io.cpp b/rtt/types/TypeStream-io.cpp index 96e23693d..eec2d501d 100644 --- a/rtt/types/TypeStream-io.cpp +++ b/rtt/types/TypeStream-io.cpp @@ -35,7 +35,7 @@ * * ***************************************************************************/ -#include "../types/TypeStream-io.hpp" +#include "rtt/types/TypeStream-io.hpp" namespace RTT { namespace types { diff --git a/rtt/types/TypeStream.cpp b/rtt/types/TypeStream.cpp index bc3da9f01..eebebfc8e 100644 --- a/rtt/types/TypeStream.cpp +++ b/rtt/types/TypeStream.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "TypeStream.hpp" -#include "TypeStream-io.hpp" +#include "rtt/types/TypeStream.hpp" +#include "rtt/types/TypeStream-io.hpp" #include namespace RTT { diff --git a/rtt/types/TypeStream.hpp b/rtt/types/TypeStream.hpp index 2b1ecd31a..13611cd73 100644 --- a/rtt/types/TypeStream.hpp +++ b/rtt/types/TypeStream.hpp @@ -42,7 +42,7 @@ #include #include #include -#include "../rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { namespace types { diff --git a/rtt/types/TypeTransporter.hpp b/rtt/types/TypeTransporter.hpp index e149af35f..283982743 100644 --- a/rtt/types/TypeTransporter.hpp +++ b/rtt/types/TypeTransporter.hpp @@ -39,9 +39,9 @@ #ifndef ORO_TYPE_TRANSPORTER_HPP #define ORO_TYPE_TRANSPORTER_HPP -#include "../base/DataSourceBase.hpp" -#include "../base/BufferBase.hpp" -#include "../base/ChannelElementBase.hpp" +#include "rtt/base/DataSourceBase.hpp" +#include "rtt/base/BufferBase.hpp" +#include "rtt/base/ChannelElementBase.hpp" namespace RTT { diff --git a/rtt/types/TypekitPlugin.hpp b/rtt/types/TypekitPlugin.hpp index 768c6e43b..6b49d6385 100644 --- a/rtt/types/TypekitPlugin.hpp +++ b/rtt/types/TypekitPlugin.hpp @@ -36,7 +36,7 @@ #include #include -#include "../rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { namespace types { @@ -108,7 +108,7 @@ namespace RTT }} -#include "TypekitRepository.hpp" +#include "rtt/types/TypekitRepository.hpp" // Disable foo() has C-linkage specified, but returns UDT 'bar' which is incompatible with C #ifdef _MSC_VER diff --git a/rtt/types/TypekitRepository.cpp b/rtt/types/TypekitRepository.cpp index 497129919..215885308 100644 --- a/rtt/types/TypekitRepository.cpp +++ b/rtt/types/TypekitRepository.cpp @@ -36,10 +36,10 @@ ***************************************************************************/ -#include "TypekitRepository.hpp" -#include "TypekitPlugin.hpp" -#include "TransportPlugin.hpp" -#include "../Logger.hpp" +#include "rtt/types/TypekitRepository.hpp" +#include "rtt/types/TypekitPlugin.hpp" +#include "rtt/types/TransportPlugin.hpp" +#include "rtt/Logger.hpp" #include namespace RTT { diff --git a/rtt/types/TypekitRepository.hpp b/rtt/types/TypekitRepository.hpp index cc8c3a4ac..5d9b21107 100644 --- a/rtt/types/TypekitRepository.hpp +++ b/rtt/types/TypekitRepository.hpp @@ -41,8 +41,8 @@ #include #include -#include "../rtt-config.h" -#include "rtt-types-fwd.hpp" +#include "rtt/rtt-config.h" +#include "rtt/types/rtt-types-fwd.hpp" namespace RTT { namespace types { diff --git a/rtt/types/Types.cpp b/rtt/types/Types.cpp index d88303158..b41a11942 100644 --- a/rtt/types/Types.cpp +++ b/rtt/types/Types.cpp @@ -35,9 +35,9 @@ * * ***************************************************************************/ -#include "Types.hpp" +#include "rtt/types/Types.hpp" -#include "rtt-config.h" +#include "rtt/rtt-config.h" namespace RTT { diff --git a/rtt/types/Types.hpp b/rtt/types/Types.hpp index 1152a8029..234338ab6 100644 --- a/rtt/types/Types.hpp +++ b/rtt/types/Types.hpp @@ -38,9 +38,9 @@ #ifndef ORO_CORELIB_TYPES_HPP #define ORO_CORELIB_TYPES_HPP -#include "TypeInfo.hpp" -#include "TypeConstructor.hpp" -#include "TypeInfoRepository.hpp" +#include "rtt/types/TypeInfo.hpp" +#include "rtt/types/TypeConstructor.hpp" +#include "rtt/types/TypeInfoRepository.hpp" /** * \file Types.hpp We need some information on types if we want to make diff --git a/rtt/types/ValueFactory.cpp b/rtt/types/ValueFactory.cpp index 997286125..9bc3d6bc2 100644 --- a/rtt/types/ValueFactory.cpp +++ b/rtt/types/ValueFactory.cpp @@ -36,8 +36,8 @@ ***************************************************************************/ -#include "ValueFactory.hpp" -#include "rtt-config.h" +#include "rtt/types/ValueFactory.hpp" +#include "rtt/rtt-config.h" namespace RTT { diff --git a/rtt/types/ValueFactory.hpp b/rtt/types/ValueFactory.hpp index c230bf457..ebb21ef45 100644 --- a/rtt/types/ValueFactory.hpp +++ b/rtt/types/ValueFactory.hpp @@ -39,10 +39,10 @@ #ifndef RTT_VALUE_TYPE_FACTORY #define RTT_VALUE_TYPE_FACTORY -#include "../base/DataSourceBase.hpp" -#include "../base/AttributeBase.hpp" -#include "../base/PropertyBase.hpp" -#include "../rtt-config.h" +#include "rtt/base/DataSourceBase.hpp" +#include "rtt/base/AttributeBase.hpp" +#include "rtt/base/PropertyBase.hpp" +#include "rtt/rtt-config.h" #include #include diff --git a/rtt/types/VectorTemplateComposition.hpp b/rtt/types/VectorTemplateComposition.hpp index 91ac893f7..bb0854242 100644 --- a/rtt/types/VectorTemplateComposition.hpp +++ b/rtt/types/VectorTemplateComposition.hpp @@ -34,11 +34,11 @@ #ifndef VECTOR_TEMPLATE_COMPOSITION_HPP #define VECTOR_TEMPLATE_COMPOSITION_HPP -#include "../Property.hpp" -#include "../PropertyBag.hpp" -#include "Types.hpp" -#include "../Logger.hpp" -#include "../internal/DataSources.hpp" +#include "rtt/Property.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/Logger.hpp" +#include "rtt/internal/DataSources.hpp" #include namespace RTT diff --git a/rtt/types/type_discovery.hpp b/rtt/types/type_discovery.hpp index 4d095b87a..eb99c47a0 100644 --- a/rtt/types/type_discovery.hpp +++ b/rtt/types/type_discovery.hpp @@ -84,11 +84,11 @@ #include #include -#include "../base/DataSourceBase.hpp" -#include "../internal/PartDataSource.hpp" -#include "../internal/DataSources.hpp" -#include "../internal/Reference.hpp" -#include "carray.hpp" +#include "rtt/base/DataSourceBase.hpp" +#include "rtt/internal/PartDataSource.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/internal/Reference.hpp" +#include "rtt/types/carray.hpp" namespace RTT { diff --git a/tests/FakeAnalogDevice.hpp b/tests/FakeAnalogDevice.hpp index 013e516cf..661fb97a6 100644 --- a/tests/FakeAnalogDevice.hpp +++ b/tests/FakeAnalogDevice.hpp @@ -28,8 +28,8 @@ #ifndef FAKEANALOGDEVICE_HPP #define FAKEANALOGDEVICE_HPP -#include -#include +#include "rtt/extras/dev/AnalogInInterface.hpp" +#include "rtt/extras/dev/AnalogOutInterface.hpp" namespace RTT { diff --git a/tests/FakeDigitalDevice.hpp b/tests/FakeDigitalDevice.hpp index dc27309e5..e6aef02f1 100644 --- a/tests/FakeDigitalDevice.hpp +++ b/tests/FakeDigitalDevice.hpp @@ -28,8 +28,8 @@ #ifndef FAKEDIGITALDEVICE_HPP #define FAKEDIGITALDEVICE_HPP -#include -#include +#include "rtt/extras/dev/DigitalInInterface.hpp" +#include "rtt/extras/dev/DigitalOutInterface.hpp" #include namespace RTT diff --git a/tests/buffers_test.cpp b/tests/buffers_test.cpp index 35c2d3838..1bad0fcc2 100644 --- a/tests/buffers_test.cpp +++ b/tests/buffers_test.cpp @@ -16,24 +16,24 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include #include -#include -#include +#include "rtt/internal/AtomicQueue.hpp" +#include "rtt/internal/AtomicMWSRQueue.hpp" -#include +#include "rtt/Activity.hpp" -#include -#include -#include -#include -#include +#include "rtt/RTT.hpp" +#include "rtt/base/Buffer.hpp" +#include "rtt/internal/ListLockFree.hpp" +#include "rtt/base/DataObject.hpp" +#include "rtt/internal/TsPool.hpp" //#include -#include +#include "rtt/os/Thread.hpp" #include #include diff --git a/tests/channelelements_test.cpp b/tests/channelelements_test.cpp index 4f727339c..1e5e8685b 100644 --- a/tests/channelelements_test.cpp +++ b/tests/channelelements_test.cpp @@ -7,10 +7,10 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include -#include +#include "rtt/base/ChannelElement.hpp" using namespace std; using namespace RTT; diff --git a/tests/cleanup_corba.cpp b/tests/cleanup_corba.cpp index cb0cafd08..c849cb98b 100644 --- a/tests/cleanup_corba.cpp +++ b/tests/cleanup_corba.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include "rtt/os/fosi.h" int main(int argc, char** argv) diff --git a/tests/configuration_test.cpp b/tests/configuration_test.cpp index 0ef9fa789..af1aca384 100644 --- a/tests/configuration_test.cpp +++ b/tests/configuration_test.cpp @@ -1,7 +1,7 @@ -#include "unit.hpp" -#include -#include -#include +#include "tests/unit.hpp" +#include "rtt/Attribute.hpp" +#include "rtt/Property.hpp" +#include "rtt/TaskContext.hpp" /** * Fixture. diff --git a/tests/corba_ipc_server.cpp b/tests/corba_ipc_server.cpp index 58a8be2ce..261976f26 100644 --- a/tests/corba_ipc_server.cpp +++ b/tests/corba_ipc_server.cpp @@ -20,24 +20,24 @@ // need access to all TLSF functions embedded in RTT // this call must occur before ALL RTT include's!! #define ORO_MEMORY_POOL -#include +#include "rtt/os/tlsf/tlsf.h" #include -#include -#include -#include -#include +#include "rtt/OperationCaller.hpp" +#include "rtt/Service.hpp" +#include "rtt/transports/corba/DataFlowI.h" +#include "rtt/transports/corba/RemotePorts.hpp" #include -#include -#include -#include -#include -#include -#include -#include +#include "rtt/transports/corba/corba.h" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/plugin/PluginLoader.hpp" +#include "rtt/transports/corba/TaskContextServer.hpp" +#include "rtt/transports/corba/TaskContextProxy.hpp" #include -#include -#include "operations_fixture.hpp" +#include "rtt/os/main.h" +#include "tests/operations_fixture.hpp" #include using namespace RTT; diff --git a/tests/corba_ipc_test.cpp b/tests/corba_ipc_test.cpp index 54e4ce1d3..15e360501 100644 --- a/tests/corba_ipc_test.cpp +++ b/tests/corba_ipc_test.cpp @@ -16,25 +16,25 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include #include -#include -#include -#include -#include +#include "rtt/OperationCaller.hpp" +#include "rtt/Service.hpp" +#include "rtt/transports/corba/DataFlowI.h" +#include "rtt/transports/corba/RemotePorts.hpp" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "rtt/transports/corba/corba.h" +#include "rtt/transports/corba/CorbaConnPolicy.hpp" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/transports/corba/TaskContextServer.hpp" +#include "rtt/transports/corba/TaskContextProxy.hpp" +#include "rtt/transports/corba/CorbaLib.hpp" +#include "rtt/internal/DataSourceTypeInfo.hpp" #include #include diff --git a/tests/corba_mqueue_ipc_server.cpp b/tests/corba_mqueue_ipc_server.cpp index 60a048710..172c4faae 100644 --- a/tests/corba_mqueue_ipc_server.cpp +++ b/tests/corba_mqueue_ipc_server.cpp @@ -20,13 +20,13 @@ // need access to all TLSF functions embedded in RTT // this call must occur before ALL RTT include's!! #define ORO_MEMORY_POOL -#include +#include "rtt/os/tlsf/tlsf.h" -#include -#include -#include -#include -#include +#include "rtt/transports/corba/TaskContextServer.hpp" +#include "rtt/transports/corba/TaskContextProxy.hpp" +#include "rtt/Port.hpp" +#include "rtt/plugin/PluginLoader.hpp" +#include "rtt/os/main.h" #include using namespace std; diff --git a/tests/corba_mqueue_ipc_test.cpp b/tests/corba_mqueue_ipc_test.cpp index 175ac4beb..f99caa58e 100644 --- a/tests/corba_mqueue_ipc_test.cpp +++ b/tests/corba_mqueue_ipc_test.cpp @@ -16,22 +16,22 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" -#include "corba_mqueue_test.hpp" +#include "tests/corba_mqueue_test.hpp" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "rtt/transports/corba/DataFlowI.h" +#include "rtt/transports/corba/RemotePorts.hpp" +#include "rtt/transports/mqueue/MQLib.hpp" +#include "rtt/transports/corba/CorbaConnPolicy.hpp" +#include "rtt/transports/corba/corba.h" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/transports/corba/TaskContextServer.hpp" +#include "rtt/transports/corba/TaskContextProxy.hpp" #include #include diff --git a/tests/corba_mqueue_test.cpp b/tests/corba_mqueue_test.cpp index 905d7995c..58c77d32a 100644 --- a/tests/corba_mqueue_test.cpp +++ b/tests/corba_mqueue_test.cpp @@ -16,16 +16,16 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" -#include "corba_mqueue_test.hpp" +#include "tests/corba_mqueue_test.hpp" #include -#include -#include -#include -#include +#include "rtt/transports/corba/DataFlowI.h" +#include "rtt/transports/corba/RemotePorts.hpp" +#include "rtt/transports/mqueue/MQLib.hpp" +#include "rtt/transports/corba/CorbaConnPolicy.hpp" using namespace std; using corba::TaskContextProxy; diff --git a/tests/corba_mqueue_test.hpp b/tests/corba_mqueue_test.hpp index 6cef07c53..2b5dc115a 100644 --- a/tests/corba_mqueue_test.hpp +++ b/tests/corba_mqueue_test.hpp @@ -20,12 +20,12 @@ #ifndef CORBA_TEST_H #define CORBA_TEST_H -#include -#include -#include -#include -#include -#include +#include "rtt/transports/corba/corba.h" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/transports/corba/TaskContextServer.hpp" +#include "rtt/transports/corba/TaskContextProxy.hpp" #include using namespace RTT; diff --git a/tests/corba_test.cpp b/tests/corba_test.cpp index 713445239..950aa6411 100644 --- a/tests/corba_test.cpp +++ b/tests/corba_test.cpp @@ -18,26 +18,26 @@ -#include "unit.hpp" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "tests/unit.hpp" + +#include "rtt/transports/corba/corba.h" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/transports/corba/TaskContextServer.hpp" +#include "rtt/transports/corba/TaskContextProxy.hpp" +#include "rtt/Service.hpp" +#include "rtt/transports/corba/DataFlowI.h" +#include "rtt/transports/corba/RemotePorts.hpp" #include -#include -#include -#include +#include "rtt/transports/corba/CorbaLib.hpp" +#include "rtt/transports/corba/CorbaConnPolicy.hpp" +#include "rtt/transports/corba/RTTCorbaConversion.hpp" #include -#include "operations_fixture.hpp" +#include "tests/operations_fixture.hpp" #include diff --git a/tests/dataflow_performance_test.cpp b/tests/dataflow_performance_test.cpp index e23967b2d..993b551c0 100644 --- a/tests/dataflow_performance_test.cpp +++ b/tests/dataflow_performance_test.cpp @@ -38,12 +38,12 @@ template struct Adaptor; (RTT_VERSION_MINOR > minor) || (RTT_VERSION_MINOR == minor && \ (RTT_VERSION_PATCH >= patch)))) - #include "TaskContext.hpp" + #include "rtt/TaskContext.hpp" #include "DataPort.hpp" #include "BufferPort.hpp" - #include "ConnPolicy.hpp" - #include "Activity.hpp" - #include "SlaveActivity.hpp" + #include "rtt/ConnPolicy.hpp" + #include "rtt/Activity.hpp" + #include "rtt/extras/SlaveActivity.hpp" using RTT::TaskContext; using RTT::OS::HighestPriority; @@ -278,11 +278,11 @@ template struct Adaptor; }; #else - #include - #include - #include - #include - #include + #include "rtt/TaskContext.hpp" + #include "rtt/InputPort.hpp" + #include "rtt/OutputPort.hpp" + #include "rtt/extras/SlaveActivity.hpp" + #include "rtt/Activity.hpp" using RTT::TaskContext; using RTT::FlowStatus; diff --git a/tests/datasource_fixture.cpp b/tests/datasource_fixture.cpp index 696d95e0b..b9d7ed85b 100644 --- a/tests/datasource_fixture.cpp +++ b/tests/datasource_fixture.cpp @@ -1,4 +1,4 @@ -#include "datasource_fixture.hpp" +#include "tests/datasource_fixture.hpp" bool operator==(const AType& a, const AType& b) { diff --git a/tests/datasource_fixture.hpp b/tests/datasource_fixture.hpp index 38b49a481..8317d668a 100644 --- a/tests/datasource_fixture.hpp +++ b/tests/datasource_fixture.hpp @@ -21,9 +21,9 @@ #define ORO_DATASOURCE_FIXTURE_HPP_ #include -#include "unit.hpp" +#include "tests/unit.hpp" #include -#include +#include "rtt/RTT.hpp" #include #include diff --git a/tests/datasource_test.cpp b/tests/datasource_test.cpp index 0432db118..5e69130a9 100644 --- a/tests/datasource_test.cpp +++ b/tests/datasource_test.cpp @@ -17,22 +17,22 @@ ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include -#include +#include "rtt/rtt-fwd.hpp" -#include -#include -#include +#include "rtt/internal/DataSources.hpp" +#include "rtt/internal/PartDataSource.hpp" +#include "rtt/internal/ArrayPartDataSource.hpp" //#include -#include +#include "rtt/internal/carray.hpp" #include -#include -#include "datasource_fixture.hpp" +#include "rtt/os/fosi.h" +#include "tests/datasource_fixture.hpp" class DataSourceTest { diff --git a/tests/dev_test.cpp b/tests/dev_test.cpp index 59fd596ce..cbb660d74 100644 --- a/tests/dev_test.cpp +++ b/tests/dev_test.cpp @@ -16,15 +16,15 @@ * * ***************************************************************************/ -#include "unit.hpp" - -#include "dev_test.hpp" -#include "FakeAnalogDevice.hpp" -#include "FakeDigitalDevice.hpp" -#include -#include -#include -#include +#include "tests/unit.hpp" + +#include "tests/dev_test.hpp" +#include "tests/FakeAnalogDevice.hpp" +#include "tests/FakeDigitalDevice.hpp" +#include "rtt/extras/dev/AnalogInput.hpp" +#include "rtt/extras/dev/AnalogOutput.hpp" +#include "rtt/extras/dev/DigitalInput.hpp" +#include "rtt/extras/dev/DigitalOutput.hpp" #include diff --git a/tests/dispatch_test.cpp b/tests/dispatch_test.cpp index 4b4cd84c5..5606288a3 100644 --- a/tests/dispatch_test.cpp +++ b/tests/dispatch_test.cpp @@ -16,17 +16,17 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" -#include "dispatch_test.hpp" +#include "tests/dispatch_test.hpp" #include #include -#include -#include -#include -#include -#include +#include "rtt/scripting/FunctionGraph.hpp" +#include "rtt/extras/SimulationThread.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Service.hpp" using namespace std; diff --git a/tests/dispatch_test.hpp b/tests/dispatch_test.hpp index 2470e1036..17df87b17 100644 --- a/tests/dispatch_test.hpp +++ b/tests/dispatch_test.hpp @@ -20,11 +20,11 @@ #ifndef DISPATCHTEST_H #define DISPATCHTEST_H -#include +#include "rtt/scripting/Parser.hpp" #include -#include +#include "rtt/TaskContext.hpp" #include -#include +#include "rtt/extras/SimulationActivity.hpp" using namespace RTT; using namespace RTT::detail; diff --git a/tests/enum_string_type_test.cpp b/tests/enum_string_type_test.cpp index 44ef895ae..3fb74271c 100644 --- a/tests/enum_string_type_test.cpp +++ b/tests/enum_string_type_test.cpp @@ -17,16 +17,16 @@ ***************************************************************************/ -#include "unit.hpp" -#include -#include -#include - -#include "datasource_fixture.hpp" -#include "marsh/PropertyBagIntrospector.hpp" -#include "types/EnumTypeInfo.hpp" -#include "marsh/PropertyLoader.hpp" -#include "TaskContext.hpp" +#include "tests/unit.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/os/fosi.h" + +#include "tests/datasource_fixture.hpp" +#include "rtt/marsh/PropertyBagIntrospector.hpp" +#include "rtt/types/EnumTypeInfo.hpp" +#include "rtt/marsh/PropertyLoader.hpp" +#include "rtt/TaskContext.hpp" typedef enum { diff --git a/tests/enum_type_test.cpp b/tests/enum_type_test.cpp index 735336af3..0d1a706a1 100644 --- a/tests/enum_type_test.cpp +++ b/tests/enum_type_test.cpp @@ -17,16 +17,16 @@ ***************************************************************************/ -#include "unit.hpp" -#include -#include -#include - -#include "datasource_fixture.hpp" -#include "marsh/PropertyBagIntrospector.hpp" -#include "types/EnumTypeInfo.hpp" -#include "marsh/PropertyLoader.hpp" -#include "TaskContext.hpp" +#include "tests/unit.hpp" +#include "rtt/rtt-fwd.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/os/fosi.h" + +#include "tests/datasource_fixture.hpp" +#include "rtt/marsh/PropertyBagIntrospector.hpp" +#include "rtt/types/EnumTypeInfo.hpp" +#include "rtt/marsh/PropertyLoader.hpp" +#include "rtt/TaskContext.hpp" typedef enum { diff --git a/tests/event_test.cpp b/tests/event_test.cpp index 7637e58f3..0c0c0b45f 100644 --- a/tests/event_test.cpp +++ b/tests/event_test.cpp @@ -16,18 +16,18 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" -#include -#include +#include "rtt/internal/Signal.hpp" +#include "rtt/extras/SlaveActivity.hpp" #include -#include -#include -#include -#include -#include -#include -#include +#include "rtt/rtt-detail-fwd.hpp" +#include "rtt/Logger.hpp" +#include "rtt/base/RunnableInterface.hpp" +#include "rtt/extras/SimulationActivity.hpp" +#include "rtt/extras/SimulationThread.hpp" +#include "rtt/Activity.hpp" +#include "rtt/os/Atomic.hpp" #include #include diff --git a/tests/function_test.cpp b/tests/function_test.cpp index 9cdd723f2..9e9504e73 100644 --- a/tests/function_test.cpp +++ b/tests/function_test.cpp @@ -17,15 +17,15 @@ ***************************************************************************/ -#include "unit.hpp" -#include "operations_fixture.hpp" +#include "tests/unit.hpp" +#include "tests/operations_fixture.hpp" -#include -#include -#include -#include -#include +#include "rtt/scripting/Parser.hpp" +#include "rtt/scripting/FunctionGraph.hpp" +#include "rtt/scripting/ScriptingService.hpp" +#include "rtt/Service.hpp" +#include "rtt/OperationCaller.hpp" class FunctionsFixture : public OperationsFixture { diff --git a/tests/functors_test.cpp b/tests/functors_test.cpp index 08ab3cfcf..9a2dc5b78 100644 --- a/tests/functors_test.cpp +++ b/tests/functors_test.cpp @@ -18,17 +18,17 @@ #include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Operation.hpp" #ifdef ORO_REMOTING -#include +#include "rtt/internal/RemoteOperationCaller.hpp" #endif -#include -#include +#include "rtt/Service.hpp" +#include "rtt/internal/DataSourceGenerator.hpp" -#include "unit.hpp" -#include "operations_fixture.hpp" +#include "tests/unit.hpp" +#include "tests/operations_fixture.hpp" /** * This test suite tests the functors (FusedMCall, FusedMCollect, FusedMSend,...) diff --git a/tests/generictask_test.cpp b/tests/generictask_test.cpp index 816148afd..dbe3ddbe4 100644 --- a/tests/generictask_test.cpp +++ b/tests/generictask_test.cpp @@ -17,20 +17,20 @@ ***************************************************************************/ -#include "unit.hpp" -#include "generictask_test.hpp" -#include -#include -#include -#include +#include "tests/unit.hpp" +#include "tests/generictask_test.hpp" +#include "rtt/scripting/FunctionGraph.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Service.hpp" +#include "rtt/internal/RemoteOperationCaller.hpp" -#include -#include +#include "rtt/extras/SimulationActivity.hpp" +#include "rtt/extras/SimulationThread.hpp" #include #include -#include +#include "rtt/Service.hpp" using namespace std; diff --git a/tests/generictask_test.hpp b/tests/generictask_test.hpp index 1e5c46358..ae1434f2c 100644 --- a/tests/generictask_test.hpp +++ b/tests/generictask_test.hpp @@ -21,7 +21,7 @@ #define GENERIC_TASK_H -#include +#include "rtt/TaskContext.hpp" #include using namespace RTT; diff --git a/tests/listlocked_test.cpp b/tests/listlocked_test.cpp index f77848c5f..01856f7cd 100644 --- a/tests/listlocked_test.cpp +++ b/tests/listlocked_test.cpp @@ -17,11 +17,11 @@ ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" -#include +#include "rtt/internal/ListLocked.hpp" #include -#include +#include "rtt/rtt-detail-fwd.hpp" using namespace RTT::detail; using namespace std; diff --git a/tests/logger_test.cpp b/tests/logger_test.cpp index 56259f271..a29e658a1 100644 --- a/tests/logger_test.cpp +++ b/tests/logger_test.cpp @@ -18,13 +18,13 @@ -#include "unit.hpp" -#include "logger_test.hpp" +#include "tests/unit.hpp" +#include "tests/logger_test.hpp" #include #include -#include -#include +#include "rtt/Activity.hpp" +#include "rtt/base/RunnableInterface.hpp" using namespace boost; using namespace std; diff --git a/tests/logger_test.hpp b/tests/logger_test.hpp index dd00d7a0f..2fac81432 100644 --- a/tests/logger_test.hpp +++ b/tests/logger_test.hpp @@ -20,7 +20,7 @@ #ifndef LOGGERTEST_H #define LOGGERTEST_H -#include +#include "rtt/Logger.hpp" using namespace RTT; diff --git a/tests/marshalling_test.cpp b/tests/marshalling_test.cpp index eda9a8f7f..02b930880 100644 --- a/tests/marshalling_test.cpp +++ b/tests/marshalling_test.cpp @@ -16,13 +16,13 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" -#include "operations_fixture.hpp" -#include -#include -#include "plugin/PluginLoader.hpp" -#include "datasource_fixture.hpp" +#include "tests/operations_fixture.hpp" +#include "rtt/marsh/Marshalling.hpp" +#include "rtt/marsh/MarshallingService.hpp" +#include "rtt/plugin/PluginLoader.hpp" +#include "tests/datasource_fixture.hpp" using namespace std; using namespace boost; diff --git a/tests/method_test.cpp b/tests/method_test.cpp index 5e2aa5a72..b9b625f37 100644 --- a/tests/method_test.cpp +++ b/tests/method_test.cpp @@ -20,13 +20,13 @@ #define ORO_TEST_OPERATION_CALLER -#include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Operation.hpp" +#include "rtt/Service.hpp" -#include "unit.hpp" -#include "operations_fixture.hpp" +#include "tests/unit.hpp" +#include "tests/operations_fixture.hpp" /** * This test suite tests the RTT::OperationCaller object's LocalOperationCaller implementation. diff --git a/tests/mqueue_archive_test.cpp b/tests/mqueue_archive_test.cpp index 2050a19b7..c15c439a5 100644 --- a/tests/mqueue_archive_test.cpp +++ b/tests/mqueue_archive_test.cpp @@ -16,7 +16,7 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include #include @@ -32,9 +32,9 @@ #include #include -#include -#include -#include +#include "rtt/rtt-fwd.hpp" +#include "rtt/transports/mqueue/binary_data_archive.hpp" +#include "rtt/os/fosi.h" using namespace std; using namespace boost::archive; diff --git a/tests/mqueue_ipc_server.cpp b/tests/mqueue_ipc_server.cpp index 6bd4ad2f9..7aebb9828 100644 --- a/tests/mqueue_ipc_server.cpp +++ b/tests/mqueue_ipc_server.cpp @@ -16,17 +16,17 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include "mqueue_test.hpp" #include -#include -#include -#include -#include -#include +#include "rtt/Service.hpp" +#include "rtt/transports/mqueue/MQLib.hpp" +#include "rtt/transports/mqueue/MQChannelElement.hpp" +#include "rtt/transports/mqueue/MQTemplateProtocol.hpp" +#include "rtt/os/fosi.h" using namespace std; using namespace RTT; diff --git a/tests/mqueue_ipc_test.cpp b/tests/mqueue_ipc_test.cpp index 32a273728..4aef60cb2 100644 --- a/tests/mqueue_ipc_test.cpp +++ b/tests/mqueue_ipc_test.cpp @@ -16,17 +16,17 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include "mqueue_test.hpp" #include -#include -#include -#include -#include -#include +#include "rtt/Service.hpp" +#include "rtt/transports/mqueue/MQLib.hpp" +#include "rtt/transports/mqueue/MQChannelElement.hpp" +#include "rtt/transports/mqueue/MQTemplateProtocol.hpp" +#include "rtt/os/fosi.h" using namespace std; using namespace RTT; diff --git a/tests/mqueue_test.cpp b/tests/mqueue_test.cpp index 49023f41c..2b5c834c5 100644 --- a/tests/mqueue_test.cpp +++ b/tests/mqueue_test.cpp @@ -16,23 +16,23 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include -#include -#include -#include -#include -#include +#include "rtt/Service.hpp" +#include "rtt/transports/mqueue/MQLib.hpp" +#include "rtt/transports/mqueue/MQChannelElement.hpp" +#include "rtt/transports/mqueue/MQTemplateProtocol.hpp" +#include "rtt/os/fosi.h" using namespace std; using namespace RTT; using namespace RTT::detail; -#include -#include -#include +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" +#include "rtt/TaskContext.hpp" #include using namespace RTT; diff --git a/tests/operation_test.cpp b/tests/operation_test.cpp index 93b91cb4f..57d24448f 100644 --- a/tests/operation_test.cpp +++ b/tests/operation_test.cpp @@ -17,13 +17,13 @@ ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" -#include -#include -#include -#include -#include +#include "rtt/rtt-fwd.hpp" +#include "rtt/Operation.hpp" +#include "rtt/Service.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/TaskContext.hpp" using namespace std; using namespace RTT::detail; diff --git a/tests/operations_fixture.cpp b/tests/operations_fixture.cpp index 2202dfee7..22e2ba407 100644 --- a/tests/operations_fixture.cpp +++ b/tests/operations_fixture.cpp @@ -20,12 +20,12 @@ #define BOOST_FUSION_INVOKE_MAX_ARITY 8 #define BOOST_FUSION_UNFUSED_MAX_ARITY 7 -#include "operations_fixture.hpp" +#include "tests/operations_fixture.hpp" #include -#include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Operation.hpp" +#include "rtt/Service.hpp" using namespace std; using namespace boost; diff --git a/tests/operations_fixture.hpp b/tests/operations_fixture.hpp index 4ccf53969..30e91fe22 100644 --- a/tests/operations_fixture.hpp +++ b/tests/operations_fixture.hpp @@ -19,8 +19,8 @@ #include -#include -#include "unit.hpp" +#include "rtt/TaskContext.hpp" +#include "tests/unit.hpp" using namespace std; using namespace boost; diff --git a/tests/operations_fixture0.cpp b/tests/operations_fixture0.cpp index 5095e1871..89e10d5a6 100644 --- a/tests/operations_fixture0.cpp +++ b/tests/operations_fixture0.cpp @@ -20,12 +20,12 @@ #define BOOST_FUSION_INVOKE_MAX_ARITY 8 #define BOOST_FUSION_UNFUSED_MAX_ARITY 7 -#include "operations_fixture.hpp" +#include "tests/operations_fixture.hpp" #include -#include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Operation.hpp" +#include "rtt/Service.hpp" using namespace std; using namespace boost; diff --git a/tests/operations_fixture1.cpp b/tests/operations_fixture1.cpp index 9b4f56036..c442edb7c 100644 --- a/tests/operations_fixture1.cpp +++ b/tests/operations_fixture1.cpp @@ -20,12 +20,12 @@ #define BOOST_FUSION_INVOKE_MAX_ARITY 8 #define BOOST_FUSION_UNFUSED_MAX_ARITY 7 -#include "operations_fixture.hpp" +#include "tests/operations_fixture.hpp" #include -#include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Operation.hpp" +#include "rtt/Service.hpp" using namespace std; using namespace boost; diff --git a/tests/operations_fixture2.cpp b/tests/operations_fixture2.cpp index 17bea1f6d..fded192d5 100644 --- a/tests/operations_fixture2.cpp +++ b/tests/operations_fixture2.cpp @@ -20,12 +20,12 @@ #define BOOST_FUSION_INVOKE_MAX_ARITY 8 #define BOOST_FUSION_UNFUSED_MAX_ARITY 7 -#include "operations_fixture.hpp" +#include "tests/operations_fixture.hpp" #include -#include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Operation.hpp" +#include "rtt/Service.hpp" using namespace std; using namespace boost; diff --git a/tests/operations_fixture3.cpp b/tests/operations_fixture3.cpp index 299080da8..3762248e3 100644 --- a/tests/operations_fixture3.cpp +++ b/tests/operations_fixture3.cpp @@ -20,12 +20,12 @@ #define BOOST_FUSION_INVOKE_MAX_ARITY 8 #define BOOST_FUSION_UNFUSED_MAX_ARITY 7 -#include "operations_fixture.hpp" +#include "tests/operations_fixture.hpp" #include -#include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Operation.hpp" +#include "rtt/Service.hpp" using namespace std; using namespace boost; diff --git a/tests/operations_fixture4.cpp b/tests/operations_fixture4.cpp index dc904d840..1c80c8bec 100644 --- a/tests/operations_fixture4.cpp +++ b/tests/operations_fixture4.cpp @@ -20,12 +20,12 @@ #define BOOST_FUSION_INVOKE_MAX_ARITY 8 #define BOOST_FUSION_UNFUSED_MAX_ARITY 7 -#include "operations_fixture.hpp" +#include "tests/operations_fixture.hpp" #include -#include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Operation.hpp" +#include "rtt/Service.hpp" using namespace std; using namespace boost; diff --git a/tests/operations_fixture5.cpp b/tests/operations_fixture5.cpp index 41ff49b87..eaf9e0773 100644 --- a/tests/operations_fixture5.cpp +++ b/tests/operations_fixture5.cpp @@ -20,12 +20,12 @@ #define BOOST_FUSION_INVOKE_MAX_ARITY 8 #define BOOST_FUSION_UNFUSED_MAX_ARITY 7 -#include "operations_fixture.hpp" +#include "tests/operations_fixture.hpp" #include -#include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Operation.hpp" +#include "rtt/Service.hpp" using namespace std; using namespace boost; diff --git a/tests/operations_fixture6.cpp b/tests/operations_fixture6.cpp index 9928a6623..ad5dc8880 100644 --- a/tests/operations_fixture6.cpp +++ b/tests/operations_fixture6.cpp @@ -20,12 +20,12 @@ #define BOOST_FUSION_INVOKE_MAX_ARITY 8 #define BOOST_FUSION_UNFUSED_MAX_ARITY 7 -#include "operations_fixture.hpp" +#include "tests/operations_fixture.hpp" #include -#include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Operation.hpp" +#include "rtt/Service.hpp" using namespace std; using namespace boost; diff --git a/tests/operations_fixture7.cpp b/tests/operations_fixture7.cpp index ce67816bf..6d89921a4 100644 --- a/tests/operations_fixture7.cpp +++ b/tests/operations_fixture7.cpp @@ -20,12 +20,12 @@ #define BOOST_FUSION_INVOKE_MAX_ARITY 8 #define BOOST_FUSION_UNFUSED_MAX_ARITY 7 -#include "operations_fixture.hpp" +#include "tests/operations_fixture.hpp" #include -#include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Operation.hpp" +#include "rtt/Service.hpp" using namespace std; using namespace boost; diff --git a/tests/plugins_test.cpp b/tests/plugins_test.cpp index b3f51d95a..3f03914a3 100644 --- a/tests/plugins_test.cpp +++ b/tests/plugins_test.cpp @@ -18,13 +18,13 @@ -#include "unit.hpp" +#include "tests/unit.hpp" #include -#include "TaskContext.hpp" -#include "plugin/Plugin.hpp" -#include "plugin/PluginLoader.hpp" -#include "internal/GlobalService.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/plugin/Plugin.hpp" +#include "rtt/plugin/PluginLoader.hpp" +#include "rtt/internal/GlobalService.hpp" /* For internal use only - check if extension contains a version. */ RTT_API bool isExtensionVersion(const std::string& ext); diff --git a/tests/ports_test.cpp b/tests/ports_test.cpp index 41615ae55..0b0888a89 100644 --- a/tests/ports_test.cpp +++ b/tests/ports_test.cpp @@ -16,18 +16,18 @@ * * ***************************************************************************/ -#include "unit.hpp" -#include -#include +#include "tests/unit.hpp" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" -#include -#include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/extras/SlaveActivity.hpp" +#include "rtt/extras/SequentialActivity.hpp" +#include "rtt/extras/SimulationActivity.hpp" +#include "rtt/extras/SimulationThread.hpp" #include -#include +#include "rtt/OperationCaller.hpp" #include diff --git a/tests/program_test.cpp b/tests/program_test.cpp index 91430035d..8d73de482 100644 --- a/tests/program_test.cpp +++ b/tests/program_test.cpp @@ -17,22 +17,22 @@ ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include #include #include -#include -#include -#include -#include -#include -#include +#include "rtt/scripting/Parser.hpp" +#include "rtt/scripting/FunctionGraph.hpp" +#include "rtt/scripting/ScriptingService.hpp" +#include "rtt/extras/SimulationThread.hpp" +#include "rtt/extras/SimulationActivity.hpp" +#include "rtt/Service.hpp" -#include -#include -#include "operations_fixture.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "tests/operations_fixture.hpp" using namespace RTT; using namespace RTT::detail; diff --git a/tests/property_composition_test.cpp b/tests/property_composition_test.cpp index 94987b4d0..c5293c257 100644 --- a/tests/property_composition_test.cpp +++ b/tests/property_composition_test.cpp @@ -1,11 +1,11 @@ #include -#include -#include -#include -#include -#include +#include "rtt/internal/DataSourceTypeInfo.hpp" +#include "rtt/types/PropertyComposition.hpp" +#include "rtt/Property.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/Logger.hpp" -#include "unit.hpp" +#include "tests/unit.hpp" class PropertyCompositionTest { diff --git a/tests/property_loader_test.cpp b/tests/property_loader_test.cpp index 9f5e538c3..c613d00b9 100644 --- a/tests/property_loader_test.cpp +++ b/tests/property_loader_test.cpp @@ -17,9 +17,9 @@ ***************************************************************************/ -#include "unit.hpp" -#include "marsh/PropertyLoader.hpp" -#include "TaskContext.hpp" +#include "tests/unit.hpp" +#include "rtt/marsh/PropertyLoader.hpp" +#include "rtt/TaskContext.hpp" struct LoaderTest { LoaderTest() : tc("tc"), pl(&tc), diff --git a/tests/property_marsh_test.cpp b/tests/property_marsh_test.cpp index 430c99e82..4982d5538 100644 --- a/tests/property_marsh_test.cpp +++ b/tests/property_marsh_test.cpp @@ -18,13 +18,13 @@ -#include -#include -#include -#include -#include +#include "rtt/marsh/PropertyMarshaller.hpp" +#include "rtt/marsh/PropertyDemarshaller.hpp" +#include "rtt/Property.hpp" +#include "rtt/PropertyBag.hpp" +#include "rtt/types/PropertyComposition.hpp" -#include "unit.hpp" +#include "tests/unit.hpp" class PropertyMarshTest { diff --git a/tests/property_test.cpp b/tests/property_test.cpp index f849d157d..175c02062 100644 --- a/tests/property_test.cpp +++ b/tests/property_test.cpp @@ -17,13 +17,13 @@ ***************************************************************************/ #include -#include -#include -#include -#include -#include +#include "rtt/marsh/PropertyBagIntrospector.hpp" +#include "rtt/internal/DataSourceTypeInfo.hpp" +#include "rtt/types/PropertyDecomposition.hpp" +#include "rtt/Property.hpp" +#include "rtt/PropertyBag.hpp" -#include "unit.hpp" +#include "tests/unit.hpp" class PropertyTest { diff --git a/tests/ptr_test.cpp b/tests/ptr_test.cpp index 6e2cd3e43..9d4247a2f 100644 --- a/tests/ptr_test.cpp +++ b/tests/ptr_test.cpp @@ -17,9 +17,9 @@ ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" -#include "ptr_test.hpp" +#include "tests/ptr_test.hpp" using namespace std; diff --git a/tests/ptr_test.hpp b/tests/ptr_test.hpp index 651b5e90d..4531597ce 100644 --- a/tests/ptr_test.hpp +++ b/tests/ptr_test.hpp @@ -20,7 +20,7 @@ #ifndef BUFFERSTEST_H #define BUFFERSTEST_H -#include +#include "rtt/extras/ReadOnlyPointer.hpp" class PtrTest { diff --git a/tests/remote_method_test.cpp b/tests/remote_method_test.cpp index 4ab8c26af..8a2a093b1 100644 --- a/tests/remote_method_test.cpp +++ b/tests/remote_method_test.cpp @@ -21,14 +21,14 @@ #define ORO_TEST_OPERATION_CALLER #include -#include -#include -#include -#include -#include - -#include "unit.hpp" -#include "operations_fixture.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Operation.hpp" +#include "rtt/internal/RemoteOperationCaller.hpp" +#include "rtt/Service.hpp" + +#include "tests/unit.hpp" +#include "tests/operations_fixture.hpp" #define wait_for_equal( a, b, times ) do { \ bool wait_for_helper; \ diff --git a/tests/rtstring_test.cpp b/tests/rtstring_test.cpp index d85db0c7a..1d9826a66 100644 --- a/tests/rtstring_test.cpp +++ b/tests/rtstring_test.cpp @@ -7,22 +7,22 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include "operations_fixture.hpp" +#include "rtt/extras/SimulationThread.hpp" +#include "rtt/extras/SimulationActivity.hpp" +#include "rtt/scripting/StateMachine.hpp" +#include "rtt/scripting/ParsedStateMachine.hpp" +#include "rtt/scripting/DumpObject.hpp" +#include "rtt/scripting/Parser.hpp" + +#include "rtt/Service.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Port.hpp" +#include "rtt/scripting/ScriptingService.hpp" +#include "tests/operations_fixture.hpp" #include #include diff --git a/tests/scripting_test.cpp b/tests/scripting_test.cpp index 5667a03cd..56d131f23 100644 --- a/tests/scripting_test.cpp +++ b/tests/scripting_test.cpp @@ -16,15 +16,15 @@ * * ***************************************************************************/ -#include "unit.hpp" - -#include "operations_fixture.hpp" -#include -#include -#include -#include -#include -#include +#include "tests/unit.hpp" + +#include "tests/operations_fixture.hpp" +#include "rtt/scripting/Scripting.hpp" +#include "rtt/scripting/ScriptingService.hpp" +#include "rtt/extras/SequentialActivity.hpp" +#include "rtt/plugin/PluginLoader.hpp" +#include "rtt/scripting/Parser.hpp" +#include "rtt/internal/GlobalService.hpp" using namespace std; diff --git a/tests/service_port_test.cpp b/tests/service_port_test.cpp index 380e55ab1..dfcf7be95 100644 --- a/tests/service_port_test.cpp +++ b/tests/service_port_test.cpp @@ -1,12 +1,12 @@ -#include -#include -#include -#include -#include - -#include "unit.hpp" -#include "operations_fixture.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/InputPort.hpp" +#include "rtt/OutputPort.hpp" +#include "rtt/Service.hpp" +#include "rtt/ServiceRequester.hpp" + +#include "tests/unit.hpp" +#include "tests/operations_fixture.hpp" struct ServicePortFixture {}; diff --git a/tests/service_test.cpp b/tests/service_test.cpp index ec4a29b4d..5b071e850 100644 --- a/tests/service_test.cpp +++ b/tests/service_test.cpp @@ -18,14 +18,14 @@ -#include -#include -#include -#include -#include - -#include "unit.hpp" -#include "operations_fixture.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Operation.hpp" +#include "rtt/Service.hpp" +#include "rtt/ServiceRequester.hpp" + +#include "tests/unit.hpp" +#include "tests/operations_fixture.hpp" // Registers the suite into the 'registry' BOOST_FIXTURE_TEST_SUITE( ServiceTestSuite, OperationsFixture ) diff --git a/tests/setup_corba.cpp b/tests/setup_corba.cpp index 7abc19645..2adffc994 100644 --- a/tests/setup_corba.cpp +++ b/tests/setup_corba.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include "rtt/os/fosi.h" int main(int argc, char** argv) { diff --git a/tests/slave_test.cpp b/tests/slave_test.cpp index c6ef5ec1d..d54557327 100644 --- a/tests/slave_test.cpp +++ b/tests/slave_test.cpp @@ -17,18 +17,18 @@ ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" -#include +#include "rtt/rtt-fwd.hpp" -#include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/Operation.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/extras/SlaveActivity.hpp" -#include -#include -#include +#include "rtt/os/Mutex.hpp" +#include "rtt/os/Condition.hpp" +#include "rtt/os/fosi.h" using namespace std; using namespace RTT::detail; diff --git a/tests/specialized_activities.cpp b/tests/specialized_activities.cpp index 15d5d005f..3b2a50647 100644 --- a/tests/specialized_activities.cpp +++ b/tests/specialized_activities.cpp @@ -6,14 +6,14 @@ #define write _write #endif -#include "unit.hpp" +#include "tests/unit.hpp" -#include "specialized_activities.hpp" -#include +#include "tests/specialized_activities.hpp" +#include "rtt/extras/FileDescriptorActivity.hpp" #include #include -#include +#include "rtt/rtt-detail-fwd.hpp" using namespace RTT::detail; using namespace std; diff --git a/tests/state_test.cpp b/tests/state_test.cpp index f2ef37174..d15885af4 100644 --- a/tests/state_test.cpp +++ b/tests/state_test.cpp @@ -16,24 +16,24 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include "operations_fixture.hpp" +#include "rtt/extras/SimulationThread.hpp" +#include "rtt/extras/SimulationActivity.hpp" +#include "rtt/scripting/StateMachine.hpp" +#include "rtt/scripting/ParsedStateMachine.hpp" +#include "rtt/scripting/DumpObject.hpp" +#include "rtt/scripting/parse_exception.hpp" +#include "rtt/internal/GlobalEngine.hpp" + +#include "rtt/Service.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/Port.hpp" +#include "rtt/scripting/ScriptingService.hpp" +#include "rtt/rt_string.hpp" +#include "tests/operations_fixture.hpp" #include #include diff --git a/tests/tasks_multiple_test.cpp b/tests/tasks_multiple_test.cpp index f4ead3cf0..2ee0f6dbb 100644 --- a/tests/tasks_multiple_test.cpp +++ b/tests/tasks_multiple_test.cpp @@ -16,11 +16,11 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" -#include "tasks_multiple_test.hpp" -#include -#include +#include "tests/tasks_multiple_test.hpp" +#include "rtt/os/threads.hpp" +#include "rtt/Logger.hpp" #include using namespace std; diff --git a/tests/tasks_multiple_test.hpp b/tests/tasks_multiple_test.hpp index 574b15c03..521d5bb56 100644 --- a/tests/tasks_multiple_test.hpp +++ b/tests/tasks_multiple_test.hpp @@ -21,8 +21,8 @@ #ifndef TASKS_MULTIPLE_TEST_HPP #define TASKS_MULTIPLE_TEST_HPP -#include -#include +#include "rtt/extras/PeriodicActivity.hpp" +#include "rtt/rtt-detail-fwd.hpp" using namespace RTT::detail; using namespace RTT; diff --git a/tests/tasks_test.cpp b/tests/tasks_test.cpp index 724ef41e7..bbe12ddb3 100644 --- a/tests/tasks_test.cpp +++ b/tests/tasks_test.cpp @@ -17,18 +17,18 @@ ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" -#include "tasks_test.hpp" +#include "tests/tasks_test.hpp" #include #include #include #include -#include -#include -#include +#include "rtt/extras/PeriodicActivity.hpp" +#include "rtt/os/TimeService.hpp" +#include "rtt/Logger.hpp" #include diff --git a/tests/tasks_test.hpp b/tests/tasks_test.hpp index 3057d8bd1..ef2e0a526 100644 --- a/tests/tasks_test.hpp +++ b/tests/tasks_test.hpp @@ -20,10 +20,10 @@ #ifndef TASKSTEST_H #define TASKSTEST_H -#include -#include -#include -#include +#include "rtt/RTT.hpp" +#include "rtt/extras/PeriodicActivity.hpp" +#include "rtt/extras/SimulationActivity.hpp" +#include "rtt/Activity.hpp" using namespace RTT; using namespace RTT::detail; diff --git a/tests/taskstates_test.cpp b/tests/taskstates_test.cpp index 7bf8218fc..da8d57133 100644 --- a/tests/taskstates_test.cpp +++ b/tests/taskstates_test.cpp @@ -16,19 +16,19 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include -#include -#include -#include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/extras/SlaveActivity.hpp" +#include "rtt/extras/SequentialActivity.hpp" +#include "rtt/extras/SimulationActivity.hpp" +#include "rtt/extras/SimulationThread.hpp" +#include "rtt/os/fosi.h" #include -#include +#include "rtt/OperationCaller.hpp" using namespace std; using namespace RTT; diff --git a/tests/taskthread_fd_test.cpp b/tests/taskthread_fd_test.cpp index b39e1bcaa..5d2b6f8de 100644 --- a/tests/taskthread_fd_test.cpp +++ b/tests/taskthread_fd_test.cpp @@ -16,15 +16,15 @@ ***************************************************************************/ -#include "taskthread_test.hpp" +#include "tests/taskthread_test.hpp" #include #include -#include -#include -#include -#include +#include "rtt/TaskContext.hpp" +#include "rtt/extras/FileDescriptorActivity.hpp" +#include "rtt/os/MainThread.hpp" +#include "rtt/Logger.hpp" #include using namespace std; diff --git a/tests/taskthread_test.cpp b/tests/taskthread_test.cpp index fd903d6af..46659cbc6 100644 --- a/tests/taskthread_test.cpp +++ b/tests/taskthread_test.cpp @@ -17,17 +17,17 @@ ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" -#include "taskthread_test.hpp" +#include "tests/taskthread_test.hpp" #include -#include -#include -#include -#include -#include +#include "rtt/extras/Activities.hpp" +#include "rtt/extras/TimerThread.hpp" +#include "rtt/extras/SimulationThread.hpp" +#include "rtt/os/MainThread.hpp" +#include "rtt/Logger.hpp" #include using namespace std; diff --git a/tests/taskthread_test.hpp b/tests/taskthread_test.hpp index 89b94c350..1fff7c625 100644 --- a/tests/taskthread_test.hpp +++ b/tests/taskthread_test.hpp @@ -21,11 +21,11 @@ #ifndef TASKSTHREADTEST_H #define TASKSTHREADTEST_H -#include -#include -#include -#include -#include +#include "rtt/extras/PeriodicActivity.hpp" +#include "rtt/extras/SimulationActivity.hpp" +#include "rtt/extras/SlaveActivity.hpp" +#include "rtt/Activity.hpp" +#include "rtt/rtt-detail-fwd.hpp" using namespace RTT::detail; using namespace RTT; diff --git a/tests/test-corba-main.cpp b/tests/test-corba-main.cpp index b7526d558..7bd9bf036 100644 --- a/tests/test-corba-main.cpp +++ b/tests/test-corba-main.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "rtt/os/main.h" +#include "rtt/Logger.hpp" +#include "rtt/transports/corba/TaskContextServer.hpp" +#include "rtt/transports/corba/TaskContextProxy.hpp" using namespace RTT; using namespace RTT::detail; diff --git a/tests/test-main.cpp b/tests/test-main.cpp index 940aa2c7b..b9f3915c3 100644 --- a/tests/test-main.cpp +++ b/tests/test-main.cpp @@ -17,8 +17,8 @@ ***************************************************************************/ -#include -#include +#include "rtt/os/main.h" +#include "rtt/Logger.hpp" int ORO_main(int argc, char** argv) { diff --git a/tests/test-runner-corba.cpp b/tests/test-runner-corba.cpp index 8ac32d9cb..f4c6efea1 100644 --- a/tests/test-runner-corba.cpp +++ b/tests/test-runner-corba.cpp @@ -19,17 +19,17 @@ // need access to all TLSF functions embedded in RTT // this call must occur before ALL RTT include's!! #define ORO_MEMORY_POOL -#include +#include "rtt/os/tlsf/tlsf.h" -#include -#include +#include "rtt/os/main.h" +#include "rtt/Logger.hpp" #include -#include -#include -#include +#include "rtt/os/StartStopManager.hpp" +#include "rtt/transports/corba/TaskContextServer.hpp" +#include "rtt/transports/corba/CorbaDispatcher.hpp" -#include "test-runner.hpp" +#include "tests/test-runner.hpp" #define BOOST_TEST_MAIN #define BOOST_TEST_DYN_LINK #include diff --git a/tests/test-runner.cpp b/tests/test-runner.cpp index ad912da7b..e2d393393 100644 --- a/tests/test-runner.cpp +++ b/tests/test-runner.cpp @@ -19,16 +19,16 @@ // need access to all TLSF functions embedded in RTT // this call must occur before ALL RTT include's!! #define ORO_MEMORY_POOL -#include +#include "rtt/os/tlsf/tlsf.h" -#include -#include +#include "rtt/os/main.h" +#include "rtt/Logger.hpp" #include #include -#include +#include "rtt/os/StartStopManager.hpp" -#include "test-runner.hpp" +#include "tests/test-runner.hpp" #define BOOST_TEST_MAIN #define BOOST_TEST_DYN_LINK #include diff --git a/tests/test-runner.hpp b/tests/test-runner.hpp index b03c73e87..e99d53bcb 100644 --- a/tests/test-runner.hpp +++ b/tests/test-runner.hpp @@ -17,7 +17,7 @@ ***************************************************************************/ -#ifdef WIN32 +#ifdef WIN32 int setenv(const char *name, const char *value, int overwrite) { if (overwrite == 0) @@ -28,5 +28,5 @@ int setenv(const char *name, const char *value, int overwrite) if (SetEnvironmentVariable(name, value) != 0) return 0; return -1; -} +} #endif \ No newline at end of file diff --git a/tests/testproject/plugins/plugins_test_global_services.cpp b/tests/testproject/plugins/plugins_test_global_services.cpp index 6554abcfe..47b728d91 100644 --- a/tests/testproject/plugins/plugins_test_global_services.cpp +++ b/tests/testproject/plugins/plugins_test_global_services.cpp @@ -17,8 +17,8 @@ ***************************************************************************/ -#include -#include +#include "rtt/Service.hpp" +#include "rtt/plugin/ServicePlugin.hpp" using namespace RTT; diff --git a/tests/testproject/plugins/plugins_test_services.cpp b/tests/testproject/plugins/plugins_test_services.cpp index 0fb69f66a..259f78bc9 100644 --- a/tests/testproject/plugins/plugins_test_services.cpp +++ b/tests/testproject/plugins/plugins_test_services.cpp @@ -17,8 +17,8 @@ ***************************************************************************/ -#include -#include +#include "rtt/Service.hpp" +#include "rtt/plugin/ServicePlugin.hpp" using namespace RTT; diff --git a/tests/testproject/types/plugins_test_types.cpp b/tests/testproject/types/plugins_test_types.cpp index 992640091..10b8a4934 100644 --- a/tests/testproject/types/plugins_test_types.cpp +++ b/tests/testproject/types/plugins_test_types.cpp @@ -24,7 +24,7 @@ * Author: kaltan */ -#include +#include "rtt/types/TypekitPlugin.hpp" class TypesPluginTest : public RTT::types::TypekitPlugin { diff --git a/tests/testtypes/MatrixTypeInfo.hpp b/tests/testtypes/MatrixTypeInfo.hpp index 10d25f62c..8a3843f82 100644 --- a/tests/testtypes/MatrixTypeInfo.hpp +++ b/tests/testtypes/MatrixTypeInfo.hpp @@ -39,10 +39,10 @@ #ifndef ORO_MATRIX_TYPE_INFO_HPP #define ORO_MATRIX_TYPE_INFO_HPP -#include "types/TemplateTypeInfo.hpp" -#include "types/MemberFactory.hpp" -#include "types/type_discovery.hpp" -#include "internal/DataSourceGenerator.hpp" +#include "rtt/types/TemplateTypeInfo.hpp" +#include "rtt/types/MemberFactory.hpp" +#include "rtt/types/type_discovery.hpp" +#include "rtt/internal/DataSourceGenerator.hpp" #include namespace RTT diff --git a/tests/testtypes/types/array_types.cpp b/tests/testtypes/types/array_types.cpp index 339b46204..3d4f6a70e 100644 --- a/tests/testtypes/types/array_types.cpp +++ b/tests/testtypes/types/array_types.cpp @@ -1,8 +1,8 @@ -#include "types/Types.hpp" -#include "types/CArrayTypeInfo.hpp" -#include "types/BoostArrayTypeInfo.hpp" -#include "../../datasource_fixture.hpp" -#include +#include "rtt/types/Types.hpp" +#include "rtt/types/CArrayTypeInfo.hpp" +#include "rtt/types/BoostArrayTypeInfo.hpp" +#include "tests/datasource_fixture.hpp" +#include "rtt/types/SequenceTypeInfo.hpp" void loadArrayTypes() { diff --git a/tests/testtypes/types/plugins_test_types.cpp b/tests/testtypes/types/plugins_test_types.cpp index 3a1a25d21..c73efc238 100644 --- a/tests/testtypes/types/plugins_test_types.cpp +++ b/tests/testtypes/types/plugins_test_types.cpp @@ -1,8 +1,8 @@ -#include -#include -#include "types/SequenceTypeInfo.hpp" -#include "../../datasource_fixture.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/types/TypekitPlugin.hpp" +#include "rtt/types/SequenceTypeInfo.hpp" +#include "tests/datasource_fixture.hpp" void loadStructTypes(); void loadSequenceTypes(); diff --git a/tests/testtypes/types/sequence_types.cpp b/tests/testtypes/types/sequence_types.cpp index 362635247..1de62e91a 100644 --- a/tests/testtypes/types/sequence_types.cpp +++ b/tests/testtypes/types/sequence_types.cpp @@ -1,6 +1,6 @@ -#include -#include "types/SequenceTypeInfo.hpp" -#include "../../datasource_fixture.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/types/SequenceTypeInfo.hpp" +#include "tests/datasource_fixture.hpp" void loadSequenceTypes() { diff --git a/tests/testtypes/types/struct_types.cpp b/tests/testtypes/types/struct_types.cpp index 547e917c4..274d4ff03 100644 --- a/tests/testtypes/types/struct_types.cpp +++ b/tests/testtypes/types/struct_types.cpp @@ -1,6 +1,6 @@ -#include -#include "types/StructTypeInfo.hpp" -#include "../../datasource_fixture.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/types/StructTypeInfo.hpp" +#include "tests/datasource_fixture.hpp" void loadStructTypes() { diff --git a/tests/time_test.cpp b/tests/time_test.cpp index 8caa05cb7..244b846d4 100644 --- a/tests/time_test.cpp +++ b/tests/time_test.cpp @@ -16,12 +16,12 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" -#include "time_test.hpp" +#include "tests/time_test.hpp" #include -#include -#include +#include "rtt/os/Timer.hpp" +#include "rtt/rtt-detail-fwd.hpp" #include #define EPSILON 0.000000002 diff --git a/tests/time_test.hpp b/tests/time_test.hpp index 89bfe05ec..ae8cba666 100644 --- a/tests/time_test.hpp +++ b/tests/time_test.hpp @@ -21,9 +21,9 @@ #ifndef TIMETEST_H #define TIMETEST_H -#include -#include -#include +#include "rtt/Time.hpp" +#include "rtt/os/TimeService.hpp" +#include "rtt/os/Timer.hpp" #include #include diff --git a/tests/tlsf_test.cpp b/tests/tlsf_test.cpp index 4ff07c895..ca064cdad 100644 --- a/tests/tlsf_test.cpp +++ b/tests/tlsf_test.cpp @@ -18,8 +18,8 @@ #define ORO_MEMORY_POOL -#include "unit.hpp" -#include +#include "tests/unit.hpp" +#include "rtt/os/tlsf/tlsf.h" #include void signal_handler(int sig_num){ diff --git a/tests/type_discovery_container_test.cpp b/tests/type_discovery_container_test.cpp index 1fde1b43b..0c053e7a8 100644 --- a/tests/type_discovery_container_test.cpp +++ b/tests/type_discovery_container_test.cpp @@ -17,21 +17,21 @@ ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include #include -#include -#include -#include -#include +#include "rtt/rtt-fwd.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/types/type_discovery.hpp" +#include "rtt/os/fosi.h" -#include "datasource_fixture.hpp" -#include "types/StructTypeInfo.hpp" -#include "types/CArrayTypeInfo.hpp" -#include "types/SequenceTypeInfo.hpp" -#include "types/BoostArrayTypeInfo.hpp" +#include "tests/datasource_fixture.hpp" +#include "rtt/types/StructTypeInfo.hpp" +#include "rtt/types/CArrayTypeInfo.hpp" +#include "rtt/types/SequenceTypeInfo.hpp" +#include "rtt/types/BoostArrayTypeInfo.hpp" using namespace boost::archive; using namespace boost::serialization; diff --git a/tests/type_discovery_struct_test.cpp b/tests/type_discovery_struct_test.cpp index e5fd584fc..668b89ee0 100644 --- a/tests/type_discovery_struct_test.cpp +++ b/tests/type_discovery_struct_test.cpp @@ -17,21 +17,21 @@ ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include #include -#include -#include -#include -#include +#include "rtt/rtt-fwd.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/types/type_discovery.hpp" +#include "rtt/os/fosi.h" -#include "datasource_fixture.hpp" -#include "types/StructTypeInfo.hpp" -#include "types/CArrayTypeInfo.hpp" -#include "types/SequenceTypeInfo.hpp" -#include "types/BoostArrayTypeInfo.hpp" +#include "tests/datasource_fixture.hpp" +#include "rtt/types/StructTypeInfo.hpp" +#include "rtt/types/CArrayTypeInfo.hpp" +#include "rtt/types/SequenceTypeInfo.hpp" +#include "rtt/types/BoostArrayTypeInfo.hpp" using namespace boost::archive; using namespace boost::serialization; diff --git a/tests/type_discovery_test.cpp b/tests/type_discovery_test.cpp index a44561db8..e808fb3b6 100644 --- a/tests/type_discovery_test.cpp +++ b/tests/type_discovery_test.cpp @@ -17,21 +17,21 @@ ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include #include -#include -#include -#include -#include +#include "rtt/rtt-fwd.hpp" +#include "rtt/internal/DataSources.hpp" +#include "rtt/types/type_discovery.hpp" +#include "rtt/os/fosi.h" -#include "datasource_fixture.hpp" -#include "types/StructTypeInfo.hpp" -#include "types/CArrayTypeInfo.hpp" -#include "types/SequenceTypeInfo.hpp" -#include "types/BoostArrayTypeInfo.hpp" +#include "tests/datasource_fixture.hpp" +#include "rtt/types/StructTypeInfo.hpp" +#include "rtt/types/CArrayTypeInfo.hpp" +#include "rtt/types/SequenceTypeInfo.hpp" +#include "rtt/types/BoostArrayTypeInfo.hpp" using namespace boost::archive; using namespace boost::serialization; diff --git a/tests/typekit_test.cpp b/tests/typekit_test.cpp index 7d478cf39..c6b66adba 100644 --- a/tests/typekit_test.cpp +++ b/tests/typekit_test.cpp @@ -24,14 +24,14 @@ * Author: kaltan */ -#include "unit.hpp" +#include "tests/unit.hpp" -#include -#include -#include -#include +#include "rtt/types/TemplateTypeInfo.hpp" +#include "rtt/types/TemplateConstructor.hpp" +#include "rtt/types/Operators.hpp" +#include "rtt/types/OperatorTypes.hpp" -#include +#include "rtt/types/SequenceTypeInfo.hpp" struct TypekitFixture { diff --git a/tests/types_test.cpp b/tests/types_test.cpp index 90ce834b1..f103da9d7 100644 --- a/tests/types_test.cpp +++ b/tests/types_test.cpp @@ -16,25 +16,25 @@ * * ***************************************************************************/ -#include "unit.hpp" +#include "tests/unit.hpp" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "datasource_fixture.hpp" -#include "operations_fixture.hpp" +#include "rtt/scripting/FunctionGraph.hpp" +#include "rtt/OperationCaller.hpp" +#include "rtt/extras/SimulationActivity.hpp" +#include "rtt/extras/SimulationThread.hpp" +#include "rtt/Service.hpp" +#include "rtt/TaskContext.hpp" +#include "rtt/scripting/ScriptingService.hpp" +#include "rtt/scripting/Parser.hpp" +#include "rtt/Service.hpp" +#include "rtt/types/GlobalsRepository.hpp" +#include "rtt/types/Types.hpp" +#include "rtt/types/StructTypeInfo.hpp" +#include "rtt/types/SequenceTypeInfo.hpp" + +#include "tests/datasource_fixture.hpp" +#include "tests/operations_fixture.hpp" using namespace std; using namespace RTT; diff --git a/tests/unit.hpp b/tests/unit.hpp index d52d68487..4c6d937c8 100644 --- a/tests/unit.hpp +++ b/tests/unit.hpp @@ -20,10 +20,10 @@ #include #include -#include -#include -#include -#include +#include "rtt/Logger.hpp" +#include "rtt/extras/SimulationActivity.hpp" +#include "rtt/extras/SimulationThread.hpp" +#include "rtt/RTT.hpp" #define BOOST_TEST_DYN_LINK #ifdef ORO_UNIT_TEST_SUITE_HACK @@ -31,7 +31,7 @@ // We use this in the build farm to get more precise // feedback for where the UT failed. To be removed // when upstream supports this too. -#include "unit_test_suite.hpp" +#include "tests/unit_test_suite.hpp" #else #include #endif