From f4112068c10f0462d70412fd92d575e461aa59c0 Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Mon, 3 Mar 2014 16:34:36 +0400
Subject: [PATCH] Using UAVCAN_PACKED_BEGIN/UAVCAN_PACKED_END macros globally

---
 libuavcan/include/uavcan/can_driver.hpp                   | 4 ++--
 libuavcan/include/uavcan/internal/map.hpp                 | 4 ++--
 .../internal/transport/outgoing_transfer_registry.hpp     | 8 ++++----
 .../include/uavcan/internal/transport/transfer_buffer.hpp | 4 ++--
 .../uavcan/internal/transport/transfer_receiver.hpp       | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libuavcan/include/uavcan/can_driver.hpp b/libuavcan/include/uavcan/can_driver.hpp
index c05f1f0110..3f3570326a 100644
--- a/libuavcan/include/uavcan/can_driver.hpp
+++ b/libuavcan/include/uavcan/can_driver.hpp
@@ -15,7 +15,7 @@ namespace uavcan
 /**
  * Raw CAN frame, as passed to/from the CAN driver.
  */
-#pragma pack(push, 1)
+UAVCAN_PACKED_BEGIN
 struct CanFrame
 {
     static const uint32_t MaskStdID = 0x000007FF;
@@ -65,7 +65,7 @@ struct CanFrame
         return (id & CanFrame::MaskExtID) > (rhs.id & CanFrame::MaskExtID);
     }
 };
-#pragma pack(pop)
+UAVCAN_PACKED_END
 
 /**
  * CAN hardware filter config struct. @ref ICanDriver::filter().
diff --git a/libuavcan/include/uavcan/internal/map.hpp b/libuavcan/include/uavcan/internal/map.hpp
index 7c90bb5744..26cebfe100 100644
--- a/libuavcan/include/uavcan/internal/map.hpp
+++ b/libuavcan/include/uavcan/internal/map.hpp
@@ -25,7 +25,7 @@ namespace uavcan
 template <typename Key, typename Value, unsigned int NumStaticEntries>
 class Map : Noncopyable
 {
-#pragma pack(push, 1)
+UAVCAN_PACKED_BEGIN
     struct KVPair
     {
         Key key;
@@ -72,7 +72,7 @@ class Map : Noncopyable
             return NULL;
         }
     };
-#pragma pack(pop)
+UAVCAN_PACKED_END
 
     LinkedListRoot<KVGroup> list_;
     IAllocator& allocator_;
diff --git a/libuavcan/include/uavcan/internal/transport/outgoing_transfer_registry.hpp b/libuavcan/include/uavcan/internal/transport/outgoing_transfer_registry.hpp
index ac60d8b63a..c43b079308 100644
--- a/libuavcan/include/uavcan/internal/transport/outgoing_transfer_registry.hpp
+++ b/libuavcan/include/uavcan/internal/transport/outgoing_transfer_registry.hpp
@@ -13,7 +13,7 @@
 namespace uavcan
 {
 
-#pragma pack(push, 1)
+UAVCAN_PACKED_BEGIN
 class OutgoingTransferRegistryKey
 {
     uint16_t data_type_id_;
@@ -47,7 +47,7 @@ public:
             (destination_node_id_ == rhs.destination_node_id_);
     }
 };
-#pragma pack(pop)
+UAVCAN_PACKED_END
 
 
 class IOutgoingTransferRegistry
@@ -62,14 +62,14 @@ public:
 template <int NumStaticEntries>
 class OutgoingTransferRegistry : public IOutgoingTransferRegistry, Noncopyable
 {
-#pragma pack(push, 1)
+UAVCAN_PACKED_BEGIN
     struct Value
     {
         uint64_t monotonic_deadline;
         TransferID tid;
         Value() : monotonic_deadline(0) { }
     };
-#pragma pack(pop)
+UAVCAN_PACKED_END
 
     class DeadlineExpiredPredicate
     {
diff --git a/libuavcan/include/uavcan/internal/transport/transfer_buffer.hpp b/libuavcan/include/uavcan/internal/transport/transfer_buffer.hpp
index 72b2a585bf..efa3c876d3 100644
--- a/libuavcan/include/uavcan/internal/transport/transfer_buffer.hpp
+++ b/libuavcan/include/uavcan/internal/transport/transfer_buffer.hpp
@@ -14,7 +14,7 @@
 
 namespace uavcan
 {
-#pragma pack(push, 1)
+UAVCAN_PACKED_BEGIN
 /**
  * API for transfer buffer users.
  */
@@ -140,7 +140,7 @@ public:
     int read(unsigned int offset, uint8_t* data, unsigned int len) const;
     int write(unsigned int offset, const uint8_t* data, unsigned int len);
 };
-#pragma pack(pop)
+UAVCAN_PACKED_END
 
 /**
  * Standalone static buffer
diff --git a/libuavcan/include/uavcan/internal/transport/transfer_receiver.hpp b/libuavcan/include/uavcan/internal/transport/transfer_receiver.hpp
index d030ad653c..885d798895 100644
--- a/libuavcan/include/uavcan/internal/transport/transfer_receiver.hpp
+++ b/libuavcan/include/uavcan/internal/transport/transfer_receiver.hpp
@@ -11,7 +11,7 @@
 namespace uavcan
 {
 
-#pragma pack(push, 1)
+UAVCAN_PACKED_BEGIN
 class TransferReceiver
 {
 public:
@@ -69,6 +69,6 @@ public:
 
     uint32_t getInterval() const { return transfer_interval_; }
 };
-#pragma pack(pop)
+UAVCAN_PACKED_END
 
 }