fixup! implementing encoder interface

Author: andreagilardoni

src/cbor/CborEncoder.cpp

@@ -16,21 +16,23 @@ Encoder::Status CBORMessageEncoderSingleton::encode(Message* message, uint8_t *
 
   cbor_encoder_init(&encoder, data, len, 0);
 
-  auto encoder_it = encoders.begin();
+  // FIXME try with std::find
+  auto encoder_it = encoders_ids.begin();
 
-  for(; encoder_it != encoders.end(); encoder_it++) {
-    if(encoder_it->first == message->id) {
+  for(; encoder_it != encoders_ids.end(); encoder_it++) {
+    if(*encoder_it == message->id) {
       break;
     }
   }
 
   // check if message.id exists on the encoders list or return error
-  if(encoder_it == encoders.end()) {
+  if(encoder_it == encoders_ids.end()) {
     return Encoder::Status::Error;
   }
+  auto encoder_inst = encoders[encoder_it - encoders_ids.begin()];
 
   // encode the message
-  if(encoder_it->second->_encode(&encoder, message) == Encoder::Status::Error) {
+  if(encoder_inst->_encode(&encoder, message) == Encoder::Status::Error) {
     return Encoder::Status::Error;
   }
 
@@ -46,17 +48,16 @@ CBORMessageEncoderSingleton& CBORMessageEncoderSingleton::getInstance() {
 }
 
 void CBORMessageEncoderSingleton::append(MessageId id, CBORMessageEncoderInterface* encoder) {
-  auto encoder_it = encoders.begin();
+  auto encoder_it = encoders_ids.begin();
 
-  for(; encoder_it != encoders.end(); encoder_it++) {
-    if(encoder_it->first == id) {
+  for(; encoder_it != encoders_ids.end(); encoder_it++) {
+    if(*encoder_it == id) {
       return;
     }
   }
 
-  encoders.push_back(
-    std::make_pair(id, encoder)
-  );
+  encoders_ids.push_back(id);
+  encoders.push_back(encoder);
 }
 
 CBORMessageEncoderInterface::CBORMessageEncoderInterface(const CBORTag tag, const MessageId id)

src/cbor/CborEncoder.h

@@ -49,7 +49,8 @@ class CBORMessageEncoderSingleton: public Encoder {
 private:
   CBORMessageEncoderSingleton() {}
 
-  std::vector<std::pair<MessageId, CBORMessageEncoderInterface*>> encoders;
+  std::vector<MessageId> encoders_ids;
+  std::vector<CBORMessageEncoderInterface*> encoders;
 };
 
 class CBORMessageEncoder: public Encoder {