19 files changed, 40 insertions, 40 deletions

diff --git a/cad/kicad/files/patch-common_gr_basic.cpp b/cad/kicad/files/patch-common_gr_basic.cpp
index d6789d31e820..2eac7ab6fdc3 100644
--- a/cad/kicad/files/patch-common_gr_basic.cpp
+++ b/cad/kicad/files/patch-common_gr_basic.cpp
@@ -5,7 +5,7 @@
  
      // A clip box exists: clip and draw the polygon.
 -    static vector<wxPoint> clippedPolygon;
-+    static std::__1::vector<wxPoint> clippedPolygon;
++    static std::vector<wxPoint> clippedPolygon;
      static pointVector     inputPolygon, outputPolygon;
  
      inputPolygon.clear();
diff --git a/cad/kicad/files/patch-eeschema_sch_bus_entry.cpp b/cad/kicad/files/patch-eeschema_sch_bus_entry.cpp
index f0f5c1709be1..03c342817d7b 100644
--- a/cad/kicad/files/patch-eeschema_sch_bus_entry.cpp
+++ b/cad/kicad/files/patch-eeschema_sch_bus_entry.cpp
@@ -5,7 +5,7 @@
  
  
 -void SCH_BUS_ENTRY::GetConnectionPoints( vector< wxPoint >& aPoints ) const
-+void SCH_BUS_ENTRY::GetConnectionPoints( std::__1::vector< wxPoint >& aPoints ) const
++void SCH_BUS_ENTRY::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
  {
      aPoints.push_back( m_pos );
      aPoints.push_back( m_End() );
diff --git a/cad/kicad/files/patch-eeschema_sch_bus_entry.h b/cad/kicad/files/patch-eeschema_sch_bus_entry.h
index f8901920c748..b3febecf4986 100644
--- a/cad/kicad/files/patch-eeschema_sch_bus_entry.h
+++ b/cad/kicad/files/patch-eeschema_sch_bus_entry.h
@@ -5,7 +5,7 @@
      bool IsConnectable() const { return true; }
  
 -    void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
-+    void GetConnectionPoints( std::__1::vector< wxPoint >& aPoints ) const;
++    void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
  
      wxString GetSelectMenuText() const;
  
diff --git a/cad/kicad/files/patch-eeschema_sch_component.cpp b/cad/kicad/files/patch-eeschema_sch_component.cpp
index d5e8204c04f1..51189ccd3bd8 100644
--- a/cad/kicad/files/patch-eeschema_sch_component.cpp
+++ b/cad/kicad/files/patch-eeschema_sch_component.cpp
@@ -5,7 +5,7 @@
  
  
 -void SCH_COMPONENT::GetConnectionPoints( vector< wxPoint >& aPoints ) const
-+void SCH_COMPONENT::GetConnectionPoints( std::__1::vector< wxPoint >& aPoints ) const
++void SCH_COMPONENT::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
  {
      LIB_PIN* pin;
      LIB_COMPONENT* component = CMP_LIBRARY::FindLibraryComponent( m_ChipName );
@@ -14,7 +14,7 @@
  
  
 -void SCH_COMPONENT::GetNetListItem( vector<NETLIST_OBJECT*>& aNetListItems,
-+void SCH_COMPONENT::GetNetListItem( std::__1::vector<NETLIST_OBJECT*>& aNetListItems,
++void SCH_COMPONENT::GetNetListItem( std::vector<NETLIST_OBJECT*>& aNetListItems,
                                      SCH_SHEET_PATH*          aSheetPath )
  {
      LIB_COMPONENT* component = CMP_LIBRARY::FindLibraryComponent( GetLibName() );
@@ -23,7 +23,7 @@
  bool SCH_COMPONENT::doIsConnected( const wxPoint& aPosition ) const
  {
 -    vector< wxPoint > pts;
-+    std::__1::vector< wxPoint > pts;
++    std::vector< wxPoint > pts;
  
      GetConnectionPoints( pts );
  
diff --git a/cad/kicad/files/patch-eeschema_sch_component.h b/cad/kicad/files/patch-eeschema_sch_component.h
index 0966860a6582..7cb9f56d4ec0 100644
--- a/cad/kicad/files/patch-eeschema_sch_component.h
+++ b/cad/kicad/files/patch-eeschema_sch_component.h
@@ -5,7 +5,7 @@
      bool IsConnectable() const { return true; }
  
 -    void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
-+    void GetConnectionPoints( std::__1::vector< wxPoint >& aPoints ) const;
++    void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
  
      SEARCH_RESULT Visit( INSPECTOR* inspector, const void* testData,
                                   const KICAD_T scanTypes[] );
@@ -14,7 +14,7 @@
      BITMAP_DEF GetMenuImage() const { return  add_component_xpm; }
  
 -    void GetNetListItem( vector<NETLIST_OBJECT*>& aNetListItems,
-+    void GetNetListItem( std::__1::vector<NETLIST_OBJECT*>& aNetListItems,
++    void GetNetListItem( std::vector<NETLIST_OBJECT*>& aNetListItems,
                                   SCH_SHEET_PATH*          aSheetPath );
  
      bool operator <( const SCH_ITEM& aItem ) const;
diff --git a/cad/kicad/files/patch-eeschema_sch_ine.h b/cad/kicad/files/patch-eeschema_sch_ine.h
index 83b7f107813e..a30cbef720b1 100644
--- a/cad/kicad/files/patch-eeschema_sch_ine.h
+++ b/cad/kicad/files/patch-eeschema_sch_ine.h
@@ -5,10 +5,10 @@
      bool MergeOverlap( SCH_LINE* aLine );
  
 -    void GetEndPoints( vector <DANGLING_END_ITEM>& aItemList );
-+    void GetEndPoints( std::__1::vector <DANGLING_END_ITEM>& aItemList );
++    void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList );
  
 -    bool IsDanglingStateChanged( vector< DANGLING_END_ITEM >& aItemList );
-+    bool IsDanglingStateChanged( std::__1::vector< DANGLING_END_ITEM >& aItemList );
++    bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList );
  
      bool IsDangling() const { return m_startIsDangling || m_endIsDangling; }
  
@@ -17,14 +17,14 @@
      bool IsConnectable() const;
  
 -    void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
-+    void GetConnectionPoints( std::__1::vector< wxPoint >& aPoints ) const;
++    void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
  
      wxString GetSelectMenuText() const;
  
      BITMAP_DEF GetMenuImage() const;
  
 -    void GetNetListItem( vector<NETLIST_OBJECT*>& aNetListItems, SCH_SHEET_PATH* aSheetPath );
-+    void GetNetListItem( std::__1::vector<NETLIST_OBJECT*>& aNetListItems, SCH_SHEET_PATH* aSheetPath );
++    void GetNetListItem( std::vector<NETLIST_OBJECT*>& aNetListItems, SCH_SHEET_PATH* aSheetPath );
  
      bool operator <( const SCH_ITEM& aItem ) const;
  
diff --git a/cad/kicad/files/patch-eeschema_sch_junction.cpp b/cad/kicad/files/patch-eeschema_sch_junction.cpp
index a710f925fd60..0613a00c137f 100644
--- a/cad/kicad/files/patch-eeschema_sch_junction.cpp
+++ b/cad/kicad/files/patch-eeschema_sch_junction.cpp
@@ -5,14 +5,14 @@
  
  
 -void SCH_JUNCTION::GetConnectionPoints( vector< wxPoint >& aPoints ) const
-+void SCH_JUNCTION::GetConnectionPoints( std::__1::vector< wxPoint >& aPoints ) const
++void SCH_JUNCTION::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
  {
      aPoints.push_back( m_pos );
  }
  
  
 -void SCH_JUNCTION::GetNetListItem( vector<NETLIST_OBJECT*>& aNetListItems,
-+void SCH_JUNCTION::GetNetListItem( std::__1::vector<NETLIST_OBJECT*>& aNetListItems,
++void SCH_JUNCTION::GetNetListItem( std::vector<NETLIST_OBJECT*>& aNetListItems,
                                     SCH_SHEET_PATH*          aSheetPath )
  {
      NETLIST_OBJECT* item = new NETLIST_OBJECT();
diff --git a/cad/kicad/files/patch-eeschema_sch_junction.h b/cad/kicad/files/patch-eeschema_sch_junction.h
index 0dab1d1f5930..db830137705c 100644
--- a/cad/kicad/files/patch-eeschema_sch_junction.h
+++ b/cad/kicad/files/patch-eeschema_sch_junction.h
@@ -5,14 +5,14 @@
      bool IsConnectable() const { return true; }
  
 -    void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
-+    void GetConnectionPoints( std::__1::vector< wxPoint >& aPoints ) const;
++    void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
  
      wxString GetSelectMenuText() const { return wxString( _( "Junction" ) ); }
  
      BITMAP_DEF GetMenuImage() const { return  add_junction_xpm; }
  
 -    void GetNetListItem( vector<NETLIST_OBJECT*>& aNetListItems, SCH_SHEET_PATH* aSheetPath );
-+    void GetNetListItem( std::__1::vector<NETLIST_OBJECT*>& aNetListItems, SCH_SHEET_PATH* aSheetPath );
++    void GetNetListItem( std::vector<NETLIST_OBJECT*>& aNetListItems, SCH_SHEET_PATH* aSheetPath );
  
      wxPoint GetPosition() const { return m_pos; }
  
diff --git a/cad/kicad/files/patch-eeschema_sch_line.cpp b/cad/kicad/files/patch-eeschema_sch_line.cpp
index ab8a45ec2ca1..5414ea44d2ff 100644
--- a/cad/kicad/files/patch-eeschema_sch_line.cpp
+++ b/cad/kicad/files/patch-eeschema_sch_line.cpp
@@ -5,7 +5,7 @@
  
  
 -void SCH_LINE::GetConnectionPoints( vector< wxPoint >& aPoints ) const
-+void SCH_LINE::GetConnectionPoints( std::__1::vector< wxPoint >& aPoints ) const
++void SCH_LINE::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
  {
      aPoints.push_back( m_start );
      aPoints.push_back( m_end );
@@ -14,7 +14,7 @@
  
  
 -void SCH_LINE::GetNetListItem( vector<NETLIST_OBJECT*>& aNetListItems,
-+void SCH_LINE::GetNetListItem( std::__1::vector<NETLIST_OBJECT*>& aNetListItems,
++void SCH_LINE::GetNetListItem( std::vector<NETLIST_OBJECT*>& aNetListItems,
                                 SCH_SHEET_PATH*          aSheetPath )
  {
      // Net list item not required for graphic lines.
diff --git a/cad/kicad/files/patch-eeschema_sch_no_connect.cpp b/cad/kicad/files/patch-eeschema_sch_no_connect.cpp
index d75e89f37c47..ae9db56ac59a 100644
--- a/cad/kicad/files/patch-eeschema_sch_no_connect.cpp
+++ b/cad/kicad/files/patch-eeschema_sch_no_connect.cpp
@@ -5,14 +5,14 @@
  
  
 -void SCH_NO_CONNECT::GetConnectionPoints( vector< wxPoint >& aPoints ) const
-+void SCH_NO_CONNECT::GetConnectionPoints( std::__1::vector< wxPoint >& aPoints ) const
++void SCH_NO_CONNECT::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
  {
      aPoints.push_back( m_pos );
  }
  
  
 -void SCH_NO_CONNECT::GetNetListItem( vector<NETLIST_OBJECT*>& aNetListItems,
-+void SCH_NO_CONNECT::GetNetListItem( std::__1::vector<NETLIST_OBJECT*>& aNetListItems,
++void SCH_NO_CONNECT::GetNetListItem( std::vector<NETLIST_OBJECT*>& aNetListItems,
                                       SCH_SHEET_PATH*          aSheetPath )
  {
      NETLIST_OBJECT* item = new NETLIST_OBJECT();
diff --git a/cad/kicad/files/patch-eeschema_sch_no_connect.h b/cad/kicad/files/patch-eeschema_sch_no_connect.h
index e70d45dc8526..9409e7434461 100644
--- a/cad/kicad/files/patch-eeschema_sch_no_connect.h
+++ b/cad/kicad/files/patch-eeschema_sch_no_connect.h
@@ -5,14 +5,14 @@
      bool IsConnectable() const { return true; }
  
 -    void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
-+    void GetConnectionPoints( std::__1::vector< wxPoint >& aPoints ) const;
++    void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
  
      wxString GetSelectMenuText() const { return wxString( _( "No Connect" ) ); }
  
      BITMAP_DEF GetMenuImage() const { return noconn_xpm; }
  
 -    void GetNetListItem( vector<NETLIST_OBJECT*>& aNetListItems, SCH_SHEET_PATH* aSheetPath );
-+    void GetNetListItem( std::__1::vector<NETLIST_OBJECT*>& aNetListItems, SCH_SHEET_PATH* aSheetPath );
++    void GetNetListItem( std::vector<NETLIST_OBJECT*>& aNetListItems, SCH_SHEET_PATH* aSheetPath );
  
      wxPoint GetPosition() const { return m_pos; }
  
diff --git a/cad/kicad/files/patch-eeschema_sch_sheet.cpp b/cad/kicad/files/patch-eeschema_sch_sheet.cpp
index 6e127a200562..b028fe01266e 100644
--- a/cad/kicad/files/patch-eeschema_sch_sheet.cpp
+++ b/cad/kicad/files/patch-eeschema_sch_sheet.cpp
@@ -5,7 +5,7 @@
  
  
 -void SCH_SHEET::GetConnectionPoints( vector< wxPoint >& aPoints ) const
-+void SCH_SHEET::GetConnectionPoints( std::__1::vector< wxPoint >& aPoints ) const
++void SCH_SHEET::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
  {
      for( size_t i = 0; i < GetPins().size(); i++ )
          aPoints.push_back( GetPins()[i].m_Pos );
@@ -14,7 +14,7 @@
  
  
 -void SCH_SHEET::GetNetListItem( vector<NETLIST_OBJECT*>& aNetListItems,
-+void SCH_SHEET::GetNetListItem( std::__1::vector<NETLIST_OBJECT*>& aNetListItems,
++void SCH_SHEET::GetNetListItem( std::vector<NETLIST_OBJECT*>& aNetListItems,
                                  SCH_SHEET_PATH*          aSheetPath )
  {
      SCH_SHEET_PATH sheetPath = *aSheetPath;
diff --git a/cad/kicad/files/patch-eeschema_sch_sheet.h b/cad/kicad/files/patch-eeschema_sch_sheet.h
index 9d9542d9e2a9..259b81c57905 100644
--- a/cad/kicad/files/patch-eeschema_sch_sheet.h
+++ b/cad/kicad/files/patch-eeschema_sch_sheet.h
@@ -5,7 +5,7 @@
      bool IsConnectable() const { return true; }
  
 -    void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
-+    void GetConnectionPoints(std::__1::vector< wxPoint >& aPoints ) const;
++    void GetConnectionPoints(std::vector< wxPoint >& aPoints ) const;
  
      SEARCH_RESULT Visit( INSPECTOR* inspector, const void* testData,
                                   const KICAD_T scanTypes[] );
@@ -14,7 +14,7 @@
      BITMAP_DEF GetMenuImage() const { return add_hierarchical_subsheet_xpm; }
  
 -    void GetNetListItem( vector<NETLIST_OBJECT*>& aNetListItems,
-+    void GetNetListItem( std::__1::vector<NETLIST_OBJECT*>& aNetListItems,
++    void GetNetListItem( std::vector<NETLIST_OBJECT*>& aNetListItems,
                                   SCH_SHEET_PATH*          aSheetPath );
  
      SCH_ITEM& operator=( const SCH_ITEM& aSheet );
diff --git a/cad/kicad/files/patch-eeschema_sch_text.cpp b/cad/kicad/files/patch-eeschema_sch_text.cpp
index ed3e5a7403e2..defd5156a6c9 100644
--- a/cad/kicad/files/patch-eeschema_sch_text.cpp
+++ b/cad/kicad/files/patch-eeschema_sch_text.cpp
@@ -5,7 +5,7 @@
  
  
 -void SCH_TEXT::GetConnectionPoints( vector< wxPoint >& aPoints ) const
-+void SCH_TEXT::GetConnectionPoints( std::__1::vector< wxPoint >& aPoints ) const
++void SCH_TEXT::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
  {
      // Normal text labels do not have connection points.  All others do.
      if( Type() == SCH_TEXT_T )
@@ -14,7 +14,7 @@
  
  
 -void SCH_TEXT::GetNetListItem( vector<NETLIST_OBJECT*>& aNetListItems,
-+void SCH_TEXT::GetNetListItem( std::__1::vector<NETLIST_OBJECT*>& aNetListItems,
++void SCH_TEXT::GetNetListItem( std::vector<NETLIST_OBJECT*>& aNetListItems,
                                 SCH_SHEET_PATH*          aSheetPath )
  {
      if( GetLayer() == LAYER_NOTES || GetLayer() == LAYER_SHEETLABEL )
diff --git a/cad/kicad/files/patch-eeschema_sch_text.h b/cad/kicad/files/patch-eeschema_sch_text.h
index 0bc99ef0c869..d2af59c3924e 100644
--- a/cad/kicad/files/patch-eeschema_sch_text.h
+++ b/cad/kicad/files/patch-eeschema_sch_text.h
@@ -5,7 +5,7 @@
      virtual bool IsSelectStateChanged( const wxRect& aRect );
  
 -    virtual void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
-+    virtual void GetConnectionPoints( std::__1::vector< wxPoint >& aPoints ) const;
++    virtual void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
  
      virtual bool CanIncrementLabel() const { return true; }
  
@@ -14,7 +14,7 @@
      virtual BITMAP_DEF GetMenuImage() const { return  add_text_xpm; }
  
 -    virtual void GetNetListItem( vector<NETLIST_OBJECT*>& aNetListItems,
-+    virtual void GetNetListItem( std::__1::vector<NETLIST_OBJECT*>& aNetListItems,
++    virtual void GetNetListItem( std::vector<NETLIST_OBJECT*>& aNetListItems,
                                   SCH_SHEET_PATH*          aSheetPath );
  
      virtual wxPoint GetPosition() const { return m_Pos; }
diff --git a/cad/kicad/files/patch-include_sch_item_struct.h b/cad/kicad/files/patch-include_sch_item_struct.h
index 0637999431b8..9027a1e9e967 100644
--- a/cad/kicad/files/patch-include_sch_item_struct.h
+++ b/cad/kicad/files/patch-include_sch_item_struct.h
@@ -5,7 +5,7 @@
  typedef boost::ptr_vector< SCH_ITEM > SCH_ITEMS;
  typedef SCH_ITEMS::iterator SCH_ITEMS_ITR;
 -typedef vector< SCH_ITEMS_ITR > SCH_ITEMS_ITRS;
-+typedef std::__1::vector< SCH_ITEMS_ITR > SCH_ITEMS_ITRS;
++typedef std::vector< SCH_ITEMS_ITR > SCH_ITEMS_ITRS;
  
  
  #define FMT_IU          SCH_ITEM::FormatInternalUnits
@@ -14,7 +14,7 @@
       * @param aItemList - List of DANGLING_END_ITEMS to add to.
       */
 -    virtual void GetEndPoints( vector< DANGLING_END_ITEM >& aItemList ) {}
-+    virtual void GetEndPoints( std::__1::vector< DANGLING_END_ITEM >& aItemList ) {}
++    virtual void GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList ) {}
  
      /**
       * Function IsDanglingStateChanged
@@ -23,7 +23,7 @@
       * @return True if the dangling state has changed from it's current setting.
       */
 -    virtual bool IsDanglingStateChanged( vector< DANGLING_END_ITEM >& aItemList ) { return false; }
-+    virtual bool IsDanglingStateChanged( std::__1::vector< DANGLING_END_ITEM >& aItemList ) { return false; }
++    virtual bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList ) { return false; }
  
      virtual bool IsDangling() const { return false; }
  
@@ -32,7 +32,7 @@
       * @param aPoints List of connection points to add to.
       */
 -    virtual void GetConnectionPoints( vector< wxPoint >& aPoints ) const { }
-+    virtual void GetConnectionPoints( std::__1::vector< wxPoint >& aPoints ) const { }
++    virtual void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const { }
  
      /**
       * Function ClearConnections
@@ -41,7 +41,7 @@
       * </p>
       */
 -    virtual void GetNetListItem( vector<NETLIST_OBJECT*>& aNetListItems,
-+    virtual void GetNetListItem( std::__1::vector<NETLIST_OBJECT*>& aNetListItems,
++    virtual void GetNetListItem( std::vector<NETLIST_OBJECT*>& aNetListItems,
                                   SCH_SHEET_PATH*          aSheetPath ) { }
  
      /**
diff --git a/cad/kicad/files/patch-kicad_dialogs_dialog_template_selector.h b/cad/kicad/files/patch-kicad_dialogs_dialog_template_selector.h
index 246b555d2c78..ee48dffcba39 100644
--- a/cad/kicad/files/patch-kicad_dialogs_dialog_template_selector.h
+++ b/cad/kicad/files/patch-kicad_dialogs_dialog_template_selector.h
@@ -5,7 +5,7 @@
  {
  protected:
 -    vector<TEMPLATE_SELECTION_PANEL*> m_panels;
-+    std::__1::vector<TEMPLATE_SELECTION_PANEL*> m_panels;
++    std::vector<TEMPLATE_SELECTION_PANEL*> m_panels;
      void AddTemplate( int aPage, PROJECT_TEMPLATE* aTemplate );
      TEMPLATE_WIDGET* m_selectedWidget;
  
diff --git a/cad/kicad/files/patch-kicad_project_template.h b/cad/kicad/files/patch-kicad_project_template.h
index a96cbe7d5dfd..676806b24885 100644
--- a/cad/kicad/files/patch-kicad_project_template.h
+++ b/cad/kicad/files/patch-kicad_project_template.h
@@ -5,7 +5,7 @@
       * and have not yet been through any renaming
       */
 -    vector<wxFileName> GetFileList();
-+    std::__1::vector<wxFileName> GetFileList();
++    std::vector<wxFileName> GetFileList();
  };
  
  #endif
diff --git a/cad/kicad/files/patch-polygon_SutherlandHodgmanClipPoly.h b/cad/kicad/files/patch-polygon_SutherlandHodgmanClipPoly.h
index e0651f4ca2df..066e8d2887fa 100644
--- a/cad/kicad/files/patch-polygon_SutherlandHodgmanClipPoly.h
+++ b/cad/kicad/files/patch-polygon_SutherlandHodgmanClipPoly.h
@@ -7,9 +7,9 @@
 -typedef vector<PointF>                 pointVector;
 -typedef vector<PointF>::iterator       pointIterator;
 -typedef vector<PointF>::const_iterator cpointIterator;
-+typedef std::__1::vector<PointF>                 pointVector;
-+typedef std::__1::vector<PointF>::iterator       pointIterator;
-+typedef std::__1::vector<PointF>::const_iterator cpointIterator;
++typedef std::vector<PointF>                 pointVector;
++typedef std::vector<PointF>::iterator       pointIterator;
++typedef std::vector<PointF>::const_iterator cpointIterator;
  
  class SutherlandHodgman
  {