ooo-build r12424 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Fri May  2 11:40:53 2008
New Revision: 12424
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12424&view=rev

Log:
2008-05-02  Tor Lillqvist  <tml novell com>

	* patches/src680/2005-express-stl-remove.diff: Apparently don't
	need to use remove instead of std::remove for MSVS2008. So add a
	term (_MSC_VER < 1500) to the preprocessor condition.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/2005-express-stl-remove.diff

Modified: trunk/patches/dev300/2005-express-stl-remove.diff
==============================================================================
--- trunk/patches/dev300/2005-express-stl-remove.diff	(original)
+++ trunk/patches/dev300/2005-express-stl-remove.diff	Fri May  2 11:40:53 2008
@@ -4,7 +4,7 @@
  		// currently be deleted. in either case, simply
  		// remove the reference from our internal storage.
  		FragmentContainer_t::iterator it(
-+#if defined(_MSC_VER) && (_MSC_VER > 1310)
++#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500)
 +			remove(
 +#else
  			std::remove(
@@ -18,7 +18,7 @@
  		// erase the reference to the given fragment from our
  		// internal container.
  		FragmentContainer_t::iterator it(
-+#if defined(_MSC_VER) && (_MSC_VER > 1310)
++#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500)
 +			remove(
 +#else
  			std::remove(
@@ -32,7 +32,7 @@
  		void InsertConnection( OTableConnection* pConnection ) { m_vTableConnection.push_back(pConnection); }
  		void RemoveConnection( OTableConnection* pConnection ) 
  		{ 
-+#if defined(_MSC_VER) && (_MSC_VER > 1310)
++#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500)
 +			m_vTableConnection.erase(remove(m_vTableConnection.begin(),m_vTableConnection.end(),pConnection),m_vTableConnection.end());
 +#else
  			m_vTableConnection.erase(::std::remove(m_vTableConnection.begin(),m_vTableConnection.end(),pConnection),m_vTableConnection.end());
@@ -46,7 +46,7 @@
  // -----------------------------------------------------------------------------
  void OJoinController::removeConnectionData(const TTableConnectionData::value_type& _pData)
  {
-+#if defined(_MSC_VER) && (_MSC_VER > 1310)
++#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500)
 +	m_vTableConnectionData.erase( remove(m_vTableConnectionData.begin(),m_vTableConnectionData.end(),_pData),m_vTableConnectionData.end());
 +#else
  	m_vTableConnectionData.erase( ::std::remove(m_vTableConnectionData.begin(),m_vTableConnectionData.end(),_pData),m_vTableConnectionData.end());
@@ -61,7 +61,7 @@
  			delete pTabWin;
  			arrInvalidTables.push_back(pData->GetAliasName());
 -
-+#if defined(_MSC_VER) && (_MSC_VER > 1310)
++#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500)
 +			pTabWinDataList->erase( remove(pTabWinDataList->begin(),pTabWinDataList->end(),*aIter) ,pTabWinDataList->end());
 +#else
  			pTabWinDataList->erase( ::std::remove(pTabWinDataList->begin(),pTabWinDataList->end(),*aIter) ,pTabWinDataList->end());
@@ -73,7 +73,7 @@
  
  		if (bInvalid)
  		{	// nein -> Pech gehabt, die Connection faellt weg
-+#if defined(_MSC_VER) && (_MSC_VER > 1310)
++#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500)
 +			pTabConnDataList->erase( remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter) ,pTabConnDataList->end());
 +#else
  			pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter) ,pTabConnDataList->end());
@@ -85,7 +85,7 @@
  
  		// die Daten zum TabWin muessen auch aus meiner Verantwortung entlassen werden
  		TTableWindowData* pTabWinDataList = m_pView->getController()->getTableWindowData();
-+#if defined(_MSC_VER) && (_MSC_VER > 1310)
++#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500)
 +		pTabWinDataList->erase( remove(pTabWinDataList->begin(),pTabWinDataList->end(),pTabWin->GetData()),pTabWinDataList->end());
 +#else
  		pTabWinDataList->erase( ::std::remove(pTabWinDataList->begin(),pTabWinDataList->end(),pTabWin->GetData()),pTabWinDataList->end());
@@ -100,7 +100,7 @@
  			delete pTabWin;
  			arrInvalidTables.push_back(pData->GetTableName());
 -
-+#if defined(_MSC_VER) && (_MSC_VER > 1310)
++#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500)
 +			pTabWinDataList->erase( remove(pTabWinDataList->begin(),pTabWinDataList->end(),*aIter) ,pTabWinDataList->end());
 +#else
  			pTabWinDataList->erase( ::std::remove(pTabWinDataList->begin(),pTabWinDataList->end(),*aIter) ,pTabWinDataList->end());
@@ -112,7 +112,7 @@
  
  			if (bInvalid)
  			{	// nein -> Pech gehabt, die Connection faellt weg
-+#if defined(_MSC_VER) && (_MSC_VER > 1310)
++#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500)
 +				pTabConnDataList->erase( remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() );
 +#else
  				pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() );
@@ -126,7 +126,7 @@
  		Type aThisRoundType = *pBegin;
  		if ( ++pBegin != pEnd )
  		{
-+#if defined(_MSC_VER) && (_MSC_VER > 1310)
++#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500)
 +			pEnd = remove( pBegin, pEnd, aThisRoundType );
 +#else
  			pEnd = ::std::remove( pBegin, pEnd, aThisRoundType );
@@ -140,7 +140,7 @@
  	Sequence< Type > aOldTypes = OStatement_BASE::getTypes();
  	if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() )
  	{
-+#if defined(_MSC_VER) && (_MSC_VER > 1310)
++#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500)
 +		remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(),
 +#else
  		::std::remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(),