From owner-svn-ports-all@FreeBSD.ORG Sun May 4 10:57:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BDA2EA89; Sun, 4 May 2014 10:57:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A94561894; Sun, 4 May 2014 10:57:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s44AvubT026252; Sun, 4 May 2014 10:57:56 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s44Avqw0026226; Sun, 4 May 2014 10:57:52 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201405041057.s44Avqw0026226@svn.freebsd.org> From: Thierry Thomas Date: Sun, 4 May 2014 10:57:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352942 - head/cad/kicad/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2014 10:57:56 -0000 Author: thierry Date: Sun May 4 10:57:52 2014 New Revision: 352942 URL: http://svnweb.freebsd.org/changeset/ports/352942 QAT: https://qat.redports.org/buildarchive/r352942/ Log: It seems that FreeBSD-9.2 does'nt like 'std::__1'... Reported by: Jenkins via swills Modified: head/cad/kicad/files/patch-common_gr_basic.cpp head/cad/kicad/files/patch-eeschema_sch_bus_entry.cpp head/cad/kicad/files/patch-eeschema_sch_bus_entry.h head/cad/kicad/files/patch-eeschema_sch_component.cpp head/cad/kicad/files/patch-eeschema_sch_component.h head/cad/kicad/files/patch-eeschema_sch_ine.h head/cad/kicad/files/patch-eeschema_sch_junction.cpp head/cad/kicad/files/patch-eeschema_sch_junction.h head/cad/kicad/files/patch-eeschema_sch_line.cpp head/cad/kicad/files/patch-eeschema_sch_no_connect.cpp head/cad/kicad/files/patch-eeschema_sch_no_connect.h head/cad/kicad/files/patch-eeschema_sch_sheet.cpp head/cad/kicad/files/patch-eeschema_sch_sheet.h head/cad/kicad/files/patch-eeschema_sch_text.cpp head/cad/kicad/files/patch-eeschema_sch_text.h head/cad/kicad/files/patch-include_sch_item_struct.h head/cad/kicad/files/patch-kicad_dialogs_dialog_template_selector.h head/cad/kicad/files/patch-kicad_project_template.h head/cad/kicad/files/patch-polygon_SutherlandHodgmanClipPoly.h Modified: head/cad/kicad/files/patch-common_gr_basic.cpp ============================================================================== --- head/cad/kicad/files/patch-common_gr_basic.cpp Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-common_gr_basic.cpp Sun May 4 10:57:52 2014 (r352942) @@ -5,7 +5,7 @@ // A clip box exists: clip and draw the polygon. - static vector clippedPolygon; -+ static std::__1::vector clippedPolygon; ++ static std::vector clippedPolygon; static pointVector inputPolygon, outputPolygon; inputPolygon.clear(); Modified: head/cad/kicad/files/patch-eeschema_sch_bus_entry.cpp ============================================================================== --- head/cad/kicad/files/patch-eeschema_sch_bus_entry.cpp Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-eeschema_sch_bus_entry.cpp Sun May 4 10:57:52 2014 (r352942) @@ -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() ); Modified: head/cad/kicad/files/patch-eeschema_sch_bus_entry.h ============================================================================== --- head/cad/kicad/files/patch-eeschema_sch_bus_entry.h Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-eeschema_sch_bus_entry.h Sun May 4 10:57:52 2014 (r352942) @@ -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; Modified: head/cad/kicad/files/patch-eeschema_sch_component.cpp ============================================================================== --- head/cad/kicad/files/patch-eeschema_sch_component.cpp Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-eeschema_sch_component.cpp Sun May 4 10:57:52 2014 (r352942) @@ -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& aNetListItems, -+void SCH_COMPONENT::GetNetListItem( std::__1::vector& aNetListItems, ++void SCH_COMPONENT::GetNetListItem( std::vector& 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 ); Modified: head/cad/kicad/files/patch-eeschema_sch_component.h ============================================================================== --- head/cad/kicad/files/patch-eeschema_sch_component.h Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-eeschema_sch_component.h Sun May 4 10:57:52 2014 (r352942) @@ -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& aNetListItems, -+ void GetNetListItem( std::__1::vector& aNetListItems, ++ void GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ); bool operator <( const SCH_ITEM& aItem ) const; Modified: head/cad/kicad/files/patch-eeschema_sch_ine.h ============================================================================== --- head/cad/kicad/files/patch-eeschema_sch_ine.h Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-eeschema_sch_ine.h Sun May 4 10:57:52 2014 (r352942) @@ -5,10 +5,10 @@ bool MergeOverlap( SCH_LINE* aLine ); - void GetEndPoints( vector & aItemList ); -+ void GetEndPoints( std::__1::vector & aItemList ); ++ void GetEndPoints( std::vector & 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& aNetListItems, SCH_SHEET_PATH* aSheetPath ); -+ void GetNetListItem( std::__1::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ); ++ void GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ); bool operator <( const SCH_ITEM& aItem ) const; Modified: head/cad/kicad/files/patch-eeschema_sch_junction.cpp ============================================================================== --- head/cad/kicad/files/patch-eeschema_sch_junction.cpp Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-eeschema_sch_junction.cpp Sun May 4 10:57:52 2014 (r352942) @@ -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& aNetListItems, -+void SCH_JUNCTION::GetNetListItem( std::__1::vector& aNetListItems, ++void SCH_JUNCTION::GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ) { NETLIST_OBJECT* item = new NETLIST_OBJECT(); Modified: head/cad/kicad/files/patch-eeschema_sch_junction.h ============================================================================== --- head/cad/kicad/files/patch-eeschema_sch_junction.h Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-eeschema_sch_junction.h Sun May 4 10:57:52 2014 (r352942) @@ -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& aNetListItems, SCH_SHEET_PATH* aSheetPath ); -+ void GetNetListItem( std::__1::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ); ++ void GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ); wxPoint GetPosition() const { return m_pos; } Modified: head/cad/kicad/files/patch-eeschema_sch_line.cpp ============================================================================== --- head/cad/kicad/files/patch-eeschema_sch_line.cpp Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-eeschema_sch_line.cpp Sun May 4 10:57:52 2014 (r352942) @@ -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& aNetListItems, -+void SCH_LINE::GetNetListItem( std::__1::vector& aNetListItems, ++void SCH_LINE::GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ) { // Net list item not required for graphic lines. Modified: head/cad/kicad/files/patch-eeschema_sch_no_connect.cpp ============================================================================== --- head/cad/kicad/files/patch-eeschema_sch_no_connect.cpp Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-eeschema_sch_no_connect.cpp Sun May 4 10:57:52 2014 (r352942) @@ -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& aNetListItems, -+void SCH_NO_CONNECT::GetNetListItem( std::__1::vector& aNetListItems, ++void SCH_NO_CONNECT::GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ) { NETLIST_OBJECT* item = new NETLIST_OBJECT(); Modified: head/cad/kicad/files/patch-eeschema_sch_no_connect.h ============================================================================== --- head/cad/kicad/files/patch-eeschema_sch_no_connect.h Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-eeschema_sch_no_connect.h Sun May 4 10:57:52 2014 (r352942) @@ -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& aNetListItems, SCH_SHEET_PATH* aSheetPath ); -+ void GetNetListItem( std::__1::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ); ++ void GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ); wxPoint GetPosition() const { return m_pos; } Modified: head/cad/kicad/files/patch-eeschema_sch_sheet.cpp ============================================================================== --- head/cad/kicad/files/patch-eeschema_sch_sheet.cpp Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-eeschema_sch_sheet.cpp Sun May 4 10:57:52 2014 (r352942) @@ -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& aNetListItems, -+void SCH_SHEET::GetNetListItem( std::__1::vector& aNetListItems, ++void SCH_SHEET::GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ) { SCH_SHEET_PATH sheetPath = *aSheetPath; Modified: head/cad/kicad/files/patch-eeschema_sch_sheet.h ============================================================================== --- head/cad/kicad/files/patch-eeschema_sch_sheet.h Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-eeschema_sch_sheet.h Sun May 4 10:57:52 2014 (r352942) @@ -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& aNetListItems, -+ void GetNetListItem( std::__1::vector& aNetListItems, ++ void GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ); SCH_ITEM& operator=( const SCH_ITEM& aSheet ); Modified: head/cad/kicad/files/patch-eeschema_sch_text.cpp ============================================================================== --- head/cad/kicad/files/patch-eeschema_sch_text.cpp Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-eeschema_sch_text.cpp Sun May 4 10:57:52 2014 (r352942) @@ -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& aNetListItems, -+void SCH_TEXT::GetNetListItem( std::__1::vector& aNetListItems, ++void SCH_TEXT::GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ) { if( GetLayer() == LAYER_NOTES || GetLayer() == LAYER_SHEETLABEL ) Modified: head/cad/kicad/files/patch-eeschema_sch_text.h ============================================================================== --- head/cad/kicad/files/patch-eeschema_sch_text.h Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-eeschema_sch_text.h Sun May 4 10:57:52 2014 (r352942) @@ -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& aNetListItems, -+ virtual void GetNetListItem( std::__1::vector& aNetListItems, ++ virtual void GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ); virtual wxPoint GetPosition() const { return m_Pos; } Modified: head/cad/kicad/files/patch-include_sch_item_struct.h ============================================================================== --- head/cad/kicad/files/patch-include_sch_item_struct.h Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-include_sch_item_struct.h Sun May 4 10:57:52 2014 (r352942) @@ -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 @@ *

*/ - virtual void GetNetListItem( vector& aNetListItems, -+ virtual void GetNetListItem( std::__1::vector& aNetListItems, ++ virtual void GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath ) { } /** Modified: head/cad/kicad/files/patch-kicad_dialogs_dialog_template_selector.h ============================================================================== --- head/cad/kicad/files/patch-kicad_dialogs_dialog_template_selector.h Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-kicad_dialogs_dialog_template_selector.h Sun May 4 10:57:52 2014 (r352942) @@ -5,7 +5,7 @@ { protected: - vector m_panels; -+ std::__1::vector m_panels; ++ std::vector m_panels; void AddTemplate( int aPage, PROJECT_TEMPLATE* aTemplate ); TEMPLATE_WIDGET* m_selectedWidget; Modified: head/cad/kicad/files/patch-kicad_project_template.h ============================================================================== --- head/cad/kicad/files/patch-kicad_project_template.h Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-kicad_project_template.h Sun May 4 10:57:52 2014 (r352942) @@ -5,7 +5,7 @@ * and have not yet been through any renaming */ - vector GetFileList(); -+ std::__1::vector GetFileList(); ++ std::vector GetFileList(); }; #endif Modified: head/cad/kicad/files/patch-polygon_SutherlandHodgmanClipPoly.h ============================================================================== --- head/cad/kicad/files/patch-polygon_SutherlandHodgmanClipPoly.h Sun May 4 10:51:02 2014 (r352941) +++ head/cad/kicad/files/patch-polygon_SutherlandHodgmanClipPoly.h Sun May 4 10:57:52 2014 (r352942) @@ -7,9 +7,9 @@ -typedef vector pointVector; -typedef vector::iterator pointIterator; -typedef vector::const_iterator cpointIterator; -+typedef std::__1::vector pointVector; -+typedef std::__1::vector::iterator pointIterator; -+typedef std::__1::vector::const_iterator cpointIterator; ++typedef std::vector pointVector; ++typedef std::vector::iterator pointIterator; ++typedef std::vector::const_iterator cpointIterator; class SutherlandHodgman {