From 1a8e45104ae151854f503efc4d8f07f537043dc8 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Mon, 2 May 2011 08:37:16 -0500 Subject: [PATCH] sweet would not compile using mingw because of clash on POINT name --- ...part_sexpr_format_EN.odt.obsolete_use_fodt | Bin 22531 -> 0 bytes new/sch_part.cpp | 3 ++- new/sch_part.h | 19 +++++++++--------- new/sch_sweet_parser.h | 2 +- new/sweet.keywords | 2 +- ...=> sweet_spec_for_schematic_parts_EN.fodt} | 0 6 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 new/eeschema_part_sexpr_format_EN.odt.obsolete_use_fodt rename new/{sweet.fodt => sweet_spec_for_schematic_parts_EN.fodt} (100%) diff --git a/new/eeschema_part_sexpr_format_EN.odt.obsolete_use_fodt b/new/eeschema_part_sexpr_format_EN.odt.obsolete_use_fodt deleted file mode 100644 index 9e41e96443ce5210c8d7b65e07d7dc835ccf2790..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22531 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 diff --git a/new/sch_part.cpp b/new/sch_part.cpp index 6774d5c7f2..e7a0641f5c 100644 --- a/new/sch_part.cpp +++ b/new/sch_part.cpp @@ -31,11 +31,12 @@ #include + /** * 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 ) diff --git a/new/sch_part.h b/new/sch_part.h index 77e094823f..65de8d09c3 100644 --- a/new/sch_part.h +++ b/new/sch_part.h @@ -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 diff --git a/new/sch_sweet_parser.h b/new/sch_sweet_parser.h index 9b55c2a89e..2e6fd3c9fb 100644 --- a/new/sch_sweet_parser.h +++ b/new/sch_sweet_parser.h @@ -29,13 +29,13 @@ #include -class POINT; typedef int STROKE; namespace SCH { class LIB_TABLE; class PART; +class POINT; // GRAPHICS diff --git a/new/sweet.keywords b/new/sweet.keywords index 475402d711..88e23fe3a1 100644 --- a/new/sweet.keywords +++ b/new/sweet.keywords @@ -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 diff --git a/new/sweet.fodt b/new/sweet_spec_for_schematic_parts_EN.fodt similarity index 100% rename from new/sweet.fodt rename to new/sweet_spec_for_schematic_parts_EN.fodt