Added workarounds for name clashing in generated messages

This commit is contained in:
Pavel Kirienko
2014-03-06 17:55:51 +04:00
parent c08aa34645
commit d470cf1fb4
5 changed files with 47 additions and 9 deletions
+1 -2
View File
@@ -9,6 +9,7 @@
#include <root_ns_a/ReportBackSoldier.hpp>
#include <root_ns_b/ServiceWithEmptyRequest.hpp>
#include <root_ns_b/ServiceWithEmptyResponse.hpp>
#include <root_ns_b/T.hpp>
TEST(Dsdl, EmptyServices)
@@ -92,13 +93,11 @@ TEST(Dsdl, Registration)
GlobalDataTypeRegistry::instance().getDataTypeIDMask(uavcan::DataTypeKindMessage, mask);
ASSERT_TRUE(mask[8]);
mask[8] = false;
ASSERT_FALSE(mask.any());
GlobalDataTypeRegistry::instance().getDataTypeIDMask(uavcan::DataTypeKindService, mask);
ASSERT_TRUE(mask[1]);
ASSERT_TRUE(mask[3]);
mask[1] = mask[3] = false;
ASSERT_FALSE(mask.any());
/*
* Reset
@@ -0,0 +1,31 @@
/*
* Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
*/
#include <gtest/gtest.h>
#include <uavcan/Timestamp.hpp>
#include <uavcan/FigureOfMerit.hpp>
#include <uavcan/mavlink/Message.hpp>
#include <uavcan/protocol/ComputeAggregateTypeSignature.hpp>
#include <uavcan/protocol/GetProtocolStatistics.hpp>
#include <uavcan/protocol/Panic.hpp>
#include <uavcan/protocol/RestartNode.hpp>
#include <uavcan/protocol/GlobalTimeSync.hpp>
#include <uavcan/protocol/DataTypeKind.hpp>
#include <uavcan/protocol/GlobalDiscoveryRequest.hpp>
#include <uavcan/protocol/GetDataTypeInfo.hpp>
#include <uavcan/protocol/Version.hpp>
#include <uavcan/protocol/NodeStatus.hpp>
#include <uavcan/protocol/GetNodeInfo.hpp>
#include <uavcan/protocol/debug/LogMessage.hpp>
#include <uavcan/protocol/debug/StartHilSimulation.hpp>
#include <uavcan/protocol/debug/KeyValue.hpp>
#include <uavcan/protocol/file/Path.hpp>
#include <uavcan/protocol/file/Read.hpp>
#include <uavcan/protocol/file/Delete.hpp>
#include <uavcan/protocol/file/Errno.hpp>
#include <uavcan/protocol/file/BeginFirmwareUpdate.hpp>
#include <uavcan/protocol/file/List.hpp>
#include <uavcan/protocol/file/BeginTransfer.hpp>
#include <uavcan/protocol/file/Crc.hpp>
#include <uavcan/protocol/file/GetInfo.hpp>
@@ -0,0 +1,2 @@
bool T = true
bool F = false