Commit 1a8e4510 authored by Dick Hollenbeck's avatar Dick Hollenbeck

sweet would not compile using mingw because of clash on POINT name

parent 1809f692
......@@ -31,11 +31,12 @@
#include <macros.h>
/**
* Function formatAt
* outputs a formatted "(at X Y [ANGLE])" s-expression
*/
static void formatAt( OUTPUTFORMATTER* out, const POINT& aPos, ANGLE aAngle, int indent=0 )
static void formatAt( OUTPUTFORMATTER* out, const SCH::POINT& aPos, ANGLE aAngle, int indent=0 )
throw( IO_ERROR )
{
// if( aPos.x || aPos.y || aAngle )
......
......@@ -103,16 +103,6 @@ class PART;
class SWEET_PARSER;
class PROPERTY;
};
/// a set of pin padnames that are electrically equivalent for a PART.
typedef std::set< wxString > MERGE_SET;
/// The key is the VISIBLE_PIN from
/// (pin_merge VISIBLE_PIN (hide HIDDEN_PIN1 HIDDEN_PIN2...))
typedef boost::ptr_map< wxString, MERGE_SET > MERGE_SETS;
class POINT : public wxPoint
{
public:
......@@ -125,6 +115,15 @@ public:
{}
};
};
/// a set of pin padnames that are electrically equivalent for a PART.
typedef std::set< wxString > MERGE_SET;
/// The key is the VISIBLE_PIN from
/// (pin_merge VISIBLE_PIN (hide HIDDEN_PIN1 HIDDEN_PIN2...))
typedef boost::ptr_map< wxString, MERGE_SET > MERGE_SETS;
/**
* Class FONTZ
......
......@@ -29,13 +29,13 @@
#include <sweet_lexer.h>
class POINT;
typedef int STROKE;
namespace SCH {
class LIB_TABLE;
class PART;
class POINT;
// GRAPHICS
......
......@@ -3,7 +3,6 @@ anchor
arc
at
bezier
inout
bold
bottom
center
......@@ -22,6 +21,7 @@ font
footprint
hide
in
inout
input_low
inverted
inverted_clk
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment