fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-13 14:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removing all dirty 'using namespace std' that were used as C++ library compatibility work-around

Browse Source
This commit is contained in:
Pavel Kirienko
2015-03-21 14:08:37 +03:00
parent 23dd75f1b0
commit ec9006381b
30 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/build_config.hpp
-1
View File
@@ -123,7 +123,6 @@
#if UAVCAN_TOSTRING
# include <string>
# include <cstdio>
#endif
/**
libuavcan/include/uavcan/data_type.hpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include <cassert>
#include <cstring>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/build_config.hpp>
#include <uavcan/transport/transfer.hpp>
libuavcan/include/uavcan/driver/can.hpp
+1 -1
View File
@@ -7,7 +7,7 @@
#define UAVCAN_DRIVER_CAN_HPP_INCLUDED
#include <cassert>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/build_config.hpp>
#include <uavcan/driver/system_clock.hpp>
libuavcan/include/uavcan/driver/system_clock.hpp
+1 -1
View File
@@ -6,7 +6,7 @@
#ifndef UAVCAN_DRIVER_SYSTEM_CLOCK_HPP_INCLUDED
#define UAVCAN_DRIVER_SYSTEM_CLOCK_HPP_INCLUDED
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/build_config.hpp>
#include <uavcan/time.hpp>
libuavcan/include/uavcan/dynamic_memory.hpp
+1 -2
View File
@@ -8,7 +8,7 @@
#include <cassert>
#include <cstdlib>
#include <cstring>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/util/templates.hpp>
#include <uavcan/util/placement_new.hpp>
#include <uavcan/build_config.hpp>
@@ -157,7 +157,6 @@ bool PoolManager<MaxPools>::addPool(IPoolAllocator* pool)
}
}
// We need to keep the pools in order, so that smallest blocks go first
using namespace std; // for qsort()
qsort(pools_, MaxPools, sizeof(IPoolAllocator*), &PoolManager::qsortComparePoolAllocators);
return retval;
}
libuavcan/include/uavcan/error.hpp
+1 -1
View File
@@ -6,7 +6,7 @@
#define UAVCAN_ERROR_HPP_INCLUDED
#include <uavcan/build_config.hpp>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
namespace uavcan
{
libuavcan/include/uavcan/helpers/component_status_manager.hpp
+1 -1
View File
@@ -6,7 +6,7 @@
#define UAVCAN_HELPERS_COMPONENT_STATUS_MANAGER_HPP_INCLUDED
#include <uavcan/build_config.hpp>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/protocol/NodeStatus.hpp>
namespace uavcan
libuavcan/include/uavcan/marshal/array.hpp
+2 -2
View File
@@ -15,6 +15,7 @@
#include <uavcan/build_config.hpp>
#include <uavcan/marshal/type_util.hpp>
#include <uavcan/marshal/integer_spec.hpp>
#include <uavcan/std.hpp>
#ifndef UAVCAN_CPP_VERSION
# error UAVCAN_CPP_VERSION
@@ -729,10 +730,9 @@ public:
const SizeType max_size = SizeType(capacity() - size());
// We have one extra byte for the null terminator, hence +1
using namespace std; // For snprintf()
const int ret = snprintf(reinterpret_cast<char*>(ptr), SizeType(max_size + 1U), format, value);
for (int i = 0; i < ::uavcan::min(ret, int(max_size)); i++)
for (int i = 0; i < min(ret, int(max_size)); i++)
{
Base::grow();
}
libuavcan/include/uavcan/marshal/bit_stream.hpp
+1 -1
View File
@@ -6,7 +6,7 @@
#define UAVCAN_MARSHAL_BIT_STREAM_HPP_INCLUDED
#include <cassert>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/util/templates.hpp>
#include <uavcan/transport/abstract_transfer_buffer.hpp>
#include <uavcan/build_config.hpp>
libuavcan/include/uavcan/marshal/float_spec.hpp
+1 -1
View File
@@ -6,7 +6,7 @@
#define UAVCAN_MARSHAL_FLOAT_SPEC_HPP_INCLUDED
#include <cmath>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/data_type.hpp>
#include <uavcan/util/templates.hpp>
#include <uavcan/build_config.hpp>
libuavcan/include/uavcan/marshal/integer_spec.hpp
+1 -1
View File
@@ -5,7 +5,7 @@
#ifndef UAVCAN_MARSHAL_INTEGER_SPEC_HPP_INCLUDED
#define UAVCAN_MARSHAL_INTEGER_SPEC_HPP_INCLUDED
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/data_type.hpp>
#include <uavcan/util/templates.hpp>
#include <uavcan/marshal/scalar_codec.hpp>
libuavcan/include/uavcan/marshal/scalar_codec.hpp
+1 -1
View File
@@ -6,7 +6,7 @@
#define UAVCAN_MARSHAL_SCALAR_CODEC_HPP_INCLUDED
#include <cassert>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/build_config.hpp>
#include <uavcan/util/templates.hpp>
#include <uavcan/marshal/bit_stream.hpp>
libuavcan/include/uavcan/node/global_data_type_registry.hpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include <cassert>
#include <uavcan/error.hpp>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/data_type.hpp>
#include <uavcan/util/bitset.hpp>
#include <uavcan/util/templates.hpp>
libuavcan/include/uavcan/node/timer.hpp
+1 -1
View File
@@ -5,7 +5,7 @@
#ifndef UAVCAN_NODE_TIMER_HPP_INCLUDED
#define UAVCAN_NODE_TIMER_HPP_INCLUDED
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/error.hpp>
#include <uavcan/build_config.hpp>
#include <uavcan/util/linked_list.hpp>
libuavcan/include/uavcan/stdint.hpp → libuavcan/include/uavcan/std.hpp
+8 -4
View File
@@ -6,6 +6,7 @@
#define UAVCAN_STDINT_HPP_INCLUDED
#include <uavcan/build_config.hpp>
#include <cstdio>
#if !defined(UAVCAN_CPP_VERSION) || !defined(UAVCAN_CPP11)
# error UAVCAN_CPP_VERSION
@@ -14,10 +15,13 @@
#if UAVCAN_CPP_VERSION >= UAVCAN_CPP11
# include <cstdint>
# include <cstdio>
namespace uavcan
{
using std::snprintf; // Can be used to replace standard snprintf() with a user-provided one.
typedef std::uint8_t uint8_t;
typedef std::uint16_t uint16_t;
typedef std::uint32_t uint32_t;
@@ -32,14 +36,14 @@ typedef std::int64_t int64_t;
#else
/*
* C++03 doesn't define standard integer types, so we pull it from the C library as a workaround.
*/
# include <stdint.h>
# include <stdint.h> // Standard integer types from C library
# include <stdio.h> // snprintf() from the C library
namespace uavcan
{
using ::snprintf;
typedef ::uint8_t uint8_t;
typedef ::uint16_t uint16_t;
typedef ::uint32_t uint32_t;
libuavcan/include/uavcan/time.hpp
+1 -3
View File
@@ -6,7 +6,7 @@
#define UAVCAN_TIME_HPP_INCLUDED
#include <cstdio>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/build_config.hpp>
#include <uavcan/util/templates.hpp>
#include <uavcan/Timestamp.hpp>
@@ -223,7 +223,6 @@ const unsigned TimeBase<T, D>::StringBufSize;
template <typename D>
void DurationBase<D>::toString(char buf[StringBufSize]) const
{
using namespace std; // For snprintf()
char* ptr = buf;
if (isNegative())
{
@@ -238,7 +237,6 @@ void DurationBase<D>::toString(char buf[StringBufSize]) const
template <typename T, typename D>
void TimeBase<T, D>::toString(char buf[StringBufSize]) const
{
using namespace std; // For snprintf()
(void)snprintf(buf, StringBufSize, "%llu.%06lu",
static_cast<unsigned long long>(toUSec() / 1000000UL),
static_cast<unsigned long>(toUSec() % 1000000UL));
libuavcan/include/uavcan/transport/abstract_transfer_buffer.hpp
+1 -1
View File
@@ -6,7 +6,7 @@
#define UAVCAN_TRANSPORT_ABSTRACT_TRANSFER_BUFFER_HPP_INCLUDED
#include <uavcan/build_config.hpp>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
namespace uavcan
{
libuavcan/include/uavcan/transport/can_io.hpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include <cassert>
#include <uavcan/error.hpp>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/util/linked_list.hpp>
#include <uavcan/dynamic_memory.hpp>
#include <uavcan/build_config.hpp>
libuavcan/include/uavcan/transport/crc.hpp
+1 -1
View File
@@ -6,7 +6,7 @@
#define UAVCAN_TRANSPORT_CRC_HPP_INCLUDED
#include <cassert>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/build_config.hpp>
namespace uavcan
libuavcan/include/uavcan/transport/dispatcher.hpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include <cassert>
#include <uavcan/error.hpp>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/build_config.hpp>
#include <uavcan/transport/perf_counter.hpp>
#include <uavcan/transport/transfer_listener.hpp>
libuavcan/include/uavcan/transport/outgoing_transfer_registry.hpp
+1 -1
View File
@@ -6,7 +6,7 @@
#define UAVCAN_TRANSPORT_OUTGOING_TRANSFER_REGISTRY_HPP_INCLUDED
#include <cassert>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/build_config.hpp>
#include <uavcan/util/map.hpp>
#include <uavcan/debug.hpp>
libuavcan/include/uavcan/transport/perf_counter.hpp
+1 -1
View File
@@ -5,7 +5,7 @@
#ifndef UAVCAN_TRANSPORT_PERF_COUNTER_HPP_INCLUDED
#define UAVCAN_TRANSPORT_PERF_COUNTER_HPP_INCLUDED
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/build_config.hpp>
namespace uavcan
libuavcan/include/uavcan/transport/transfer.hpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include <cassert>
#include <uavcan/build_config.hpp>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
namespace uavcan
{
libuavcan/include/uavcan/transport/transfer_buffer.hpp
+1 -1
View File
@@ -5,7 +5,7 @@
#ifndef UAVCAN_TRANSPORT_TRANSFER_BUFFER_HPP_INCLUDED
#define UAVCAN_TRANSPORT_TRANSFER_BUFFER_HPP_INCLUDED
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/error.hpp>
#include <uavcan/transport/frame.hpp>
#include <uavcan/transport/abstract_transfer_buffer.hpp>
libuavcan/include/uavcan/transport/transfer_listener.hpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include <cassert>
#include <uavcan/error.hpp>
#include <uavcan/stdint.hpp>
#include <uavcan/std.hpp>
#include <uavcan/transport/transfer_receiver.hpp>
#include <uavcan/transport/perf_counter.hpp>
#include <uavcan/util/linked_list.hpp>
libuavcan/src/driver/uc_can.cpp
-2
View File
@@ -59,8 +59,6 @@ bool CanFrame::priorityHigherThan(const CanFrame& rhs) const
#if UAVCAN_TOSTRING
std::string CanFrame::toString(StringRepresentation mode) const
{
using namespace std; // For snprintf()
UAVCAN_ASSERT(mode == StrTight || mode == StrAligned);
static const unsigned AsciiColumnOffset = 36U;
libuavcan/src/transport/uc_frame.cpp
-1
View File
@@ -198,7 +198,6 @@ bool Frame::operator==(const Frame& rhs) const
#if UAVCAN_TOSTRING
std::string Frame::toString() const
{
using namespace std; // For snprintf()
/*
* Frame ID fields, according to UAVCAN specs:
* - Data Type ID
libuavcan/src/transport/uc_outgoing_transfer_registry.cpp
-1
View File
@@ -12,7 +12,6 @@ namespace uavcan
#if UAVCAN_TOSTRING
std::string OutgoingTransferRegistryKey::toString() const
{
using namespace std;
char buf[40];
(void)snprintf(buf, sizeof(buf), "dtid=%u tt=%u dnid=%u",
int(data_type_id_.get()), int(transfer_type_), int(destination_node_id_.get()));
libuavcan/src/transport/uc_transfer_buffer.cpp
-1
View File
@@ -14,7 +14,6 @@ namespace uavcan
#if UAVCAN_TOSTRING
std::string TransferBufferManagerKey::toString() const
{
using namespace std; // For snprintf()
char buf[24];
(void)snprintf(buf, sizeof(buf), "nid=%i tt=%i", int(node_id_.get()), int(transfer_type_));
return std::string(buf);
libuavcan/src/uc_data_type.cpp
-1
View File
@@ -111,7 +111,6 @@ std::string DataTypeDescriptor::toString() const
}
}
using namespace std; // For snprintf()
char buf[128];
(void)snprintf(buf, sizeof(buf), "%s:%u%c:%016llx",
full_name_, static_cast<unsigned>(id_.get()), kindch,