Skip to content

Commit

Permalink
Fix include order
Browse files Browse the repository at this point in the history
Due to robotology/icub-firmware-shared#22 defining float32_t,
conflicting with YARP yarp::conf::float32_t introduced in
robotology/yarp#1677, icub-firmware-shared headers must be included
before any include from YARP, since doing the opposite will cause
a build error.
  • Loading branch information
drdanz committed May 11, 2018
1 parent 93873c6 commit bdb1128
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/tools/canLoader/canLoaderLib/downloader.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,18 @@
#ifndef DOWNLOADER_H
#define DOWNLOADER_H

#include "EoBoards.h"
#include "EoCommon.h"

#include "driver.h"

#include <canProtocolLib/iCubCanProto_types.h>

#include <yarp/os/Searchable.h>
#include <yarp/dev/CanBusInterface.h>

#include <fstream>
#include "stdint.h"
#include <stdint.h>


//*****************************************************************/
Expand Down Expand Up @@ -72,13 +79,6 @@ void drv_sleep (double time);



#include "driver.h"

#include "EoBoards.h"
#include "EoCommon.h"

#include <canProtocolLib/iCubCanProto_types.h>

// it forces the use of the new driver2 interface
#define DOWNLOADER_USE_IDRIVER2

Expand Down

0 comments on commit bdb1128

Please sign in to comment.