haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compiler redefined warnings for FMT_IU

This commit is contained in:
Russell Oliver 2017-10-11 21:33:37 +11:00 committed by Maciej Suminski
parent a8fa64f158
commit 3145829b77
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/eda_text.cpp
View File

@ -38,9 +38,13 @@
// Conversion to application internal units defined at build time. // Conversion to application internal units defined at build time.
#if defined( PCBNEW ) #if defined( PCBNEW )
#include <class_board_item.h> // for FMT_IU #include <class_board_item.h>
#define FMT_IU BOARD_ITEM::FormatInternalUnits
#define FMT_ANGLE BOARD_ITEM::FormatAngle
#elif defined( EESCHEMA ) #elif defined( EESCHEMA )
#include <sch_item_struct.h> // for FMT_IU #include <sch_item_struct.h>
#define FMT_IU SCH_ITEM::FormatInternalUnits
#define FMT_ANGLE SCH_ITEM::FormatAngle
#elif defined( GERBVIEW ) #elif defined( GERBVIEW )
#elif defined( PL_EDITOR ) #elif defined( PL_EDITOR )
#include <base_units.h> #include <base_units.h>

2
eeschema/sch_item_struct.h
View File

@ -51,8 +51,6 @@ typedef SCH_ITEMS::iterator SCH_ITEMS_ITR;
typedef std::vector< SCH_ITEMS_ITR > SCH_ITEMS_ITRS; typedef std::vector< SCH_ITEMS_ITR > SCH_ITEMS_ITRS;
#define FMT_IU SCH_ITEM::FormatInternalUnits
#define FMT_ANGLE SCH_ITEM::FormatAngle
/** /**

3
include/class_board_item.h
View File

@ -35,9 +35,6 @@
#include <gr_basic.h> #include <gr_basic.h>
#include <layers_id_colors_and_visibility.h> #include <layers_id_colors_and_visibility.h>
/// Abbrevation for fomatting internal units to a string.
#define FMT_IU BOARD_ITEM::FormatInternalUnits
#define FMT_ANGLE BOARD_ITEM::FormatAngle
class BOARD; class BOARD;
class BOARD_ITEM_CONTAINER; class BOARD_ITEM_CONTAINER;

4
pcbnew/class_netclass.cpp
View File

@ -33,6 +33,10 @@
#include <class_board.h> #include <class_board.h>
#include <class_netclass.h> #include <class_netclass.h>
/// Abbrevation for fomatting internal units to a string.
#define FMT_IU BOARD_ITEM::FormatInternalUnits
#define FMT_ANGLE BOARD_ITEM::FormatAngle
// This will get mapped to "kicad_default" in the specctra_export. // This will get mapped to "kicad_default" in the specctra_export.
const char NETCLASS::Default[] = "Default"; const char NETCLASS::Default[] = "Default";