--- V76_00_16.orig/MaxDB_ORG/sys/src/SAPDB/RunTime/Communication/RTEComm_URIBuilder.hpp 2005-12-31 18:35:51.000000000 +0100 +++ V76_00_16/MaxDB_ORG/sys/src/SAPDB/RunTime/Communication/RTEComm_URIBuilder.hpp 2005-12-31 18:38:24.000000000 +0100 @@ -453,7 +453,7 @@ public: void CleanUp (); -private: +// HM051231 private: // Do not allow to use copy constructor outside RTEComm_URIBuilder (const RTEComm_URIBuilder & uriBuilder) : m_URI (uriBuilder.m_URI), @@ -467,6 +467,7 @@ private: @brief Build up URI */ +private: //HM051231 URIBuildRC BuildURI (SAPDB_Char const * const path, SAPDB_Char const * const protocol, SAPDB_UTF8 const * const serverDB, --- V76_00_16.orig/MaxDB_ORG/sys/src/SAPDB/Interfaces/Runtime/Util/IFRUtil_LinkedList.h 2005-12-31 18:44:33.000000000 +0100 +++ V76_00_16/MaxDB_ORG/sys/src/SAPDB/Interfaces/Runtime/Util/IFRUtil_LinkedList.h 2005-12-31 18:45:42.000000000 +0100 @@ -36,6 +36,7 @@ //#include "SAPDB/Interfaces/Runtime/IFR_Trace.h" #include "SAPDB/Interfaces/SQLDBC/SQLDBC_Internals.h" +#include "SAPDB/Interfaces/Runtime/Util/IFRUtil_RuntimeItem.h" /*! @class IFRUtil_LinkedList --- V76_00_16.orig/MaxDB_ORG/sys/src/SAPDB/ServerTasks/SrvTasks_JobList.hpp 2005-12-31 21:26:00.000000000 +0100 +++ V76_00_16/MaxDB_ORG/sys/src/SAPDB/ServerTasks/SrvTasks_JobList.hpp 2005-12-31 21:27:06.000000000 +0100 @@ -354,7 +354,7 @@ void SrvTasks_JobList::RemoveAllJob typename Container_Vector::Iterator iter; for ( iter = this->Begin(); iter != this->End(); ++iter ) if ( *iter != 0 ) - destroy(*iter, GetAllocator()); + destroy(*iter, this->GetAllocator()); this->Delete(); } //-------------------------------------------------------------------------------------- @@ -383,7 +383,7 @@ void SrvTasks_JobList::WriteToTrace template inline void SrvTasks_JobList::RemoveJob(typename Container_Vector::Iterator &job) { - destroy(*job, GetAllocator()); + destroy(*job, this->GetAllocator()); Delete(job); } --- V76_00_16.orig/MaxDB_ORG/sys/src/SAPDB/DataAccess/Data_ChainSplitSpaceBackwardRead.hpp 2005-12-31 21:36:43.000000000 +0100 +++ V76_00_16/MaxDB_ORG/sys/src/SAPDB/DataAccess/Data_ChainSplitSpaceBackwardRead.hpp 2005-12-31 21:38:53.000000000 +0100 @@ -121,7 +121,7 @@ public: // PTS 1117126 UH 2002-08-07 removed UndoLastReservedSpace() if(!m_RecordSpace.Deassign(errlist,isOK)) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } return true; @@ -172,7 +172,7 @@ public: m_BreakInfo.lastAccessMode = GetCurrentPage().AccessMode(); if ( ! Invalidate(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist,"Break"); + this->AppendContextInfo(__CONTEXT__,errlist,"Break"); return false; } return true; @@ -191,11 +191,11 @@ public: WriteToTrace ("Continue(): IsValid() is true"); if ( ! Invalidate(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist,"BackwardRead::Continue() could not invalidate record space"); + this->AppendContextInfo(__CONTEXT__,errlist,"BackwardRead::Continue() could not invalidate record space"); return false; } m_BreakInfo = BreakInfo(); - AppendContextInfo(__CONTEXT__,errlist,"BackwardRead::Continue() call without break"); + this->AppendContextInfo(__CONTEXT__,errlist,"BackwardRead::Continue() call without break"); return false; // PTS 1134170 mb 2005-03-22 } @@ -204,7 +204,7 @@ public: m_BreakInfo.lastAccessMode, errlist ) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); m_BreakInfo = BreakInfo(); (void)Invalidate(errlist); return false; @@ -214,7 +214,7 @@ public: (void)Deref(result,errlist); if ( ! result ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); m_BreakInfo = BreakInfo(); (void)Invalidate(errlist); return false; @@ -263,7 +263,7 @@ public: { result = AssignRecordspace (m_RecordIterator, errlist); if ( ! result ) - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); } return m_RecordSpace; } @@ -290,7 +290,7 @@ public: // reorder and reassign the split record space if ( ! m_RecordSpace.Reassign (errlist, KEEP_FIRST_PART) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } m_RecordSpaceIsComplete = false; @@ -312,13 +312,13 @@ public: if ( ! m_PAM.ReleasePage(Page, errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } if ( ! m_PAM.GetPage (Page, PrevPageNo, errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); m_RecordSpace.WriteToTrace("--"); errlist = errlist + Data_Exception(__CONTEXT__, DATA_CHAIN_IS_INCONSISTENT, @@ -332,7 +332,7 @@ public: { if ( ! m_RecordSpace.Deassign(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } } @@ -370,7 +370,7 @@ public: { if ( ! m_RecordSpace.Reassign(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } } @@ -378,13 +378,13 @@ public: { if ( ! m_RecordSpace.Deassign(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } m_RecordSpace.SetAccessMode(AccessMode); if ( ! m_RecordSpace.UseNextPart(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } if ( ! m_PAM.GetPage (m_RecordSpace.GetCurrentPage(), @@ -392,7 +392,7 @@ public: AccessMode, errlist ) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } } @@ -402,7 +402,7 @@ public: m_RecordSpace.SetAccessMode(AccessMode); if ( ! m_RecordSpace.UseNextPart(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } if ( ! m_PAM.GetPage (m_RecordSpace.GetCurrentPage(), @@ -410,7 +410,7 @@ public: AccessMode, errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } } @@ -448,7 +448,7 @@ public: else { errlist = Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,"the entry is corrupted or a wrong page was read"); - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } @@ -459,7 +459,7 @@ public: if ( ! RecordIter.LengthIsValid() ) // PTS 1113270 UH 2001-12-28 { errlist = Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,"the entry is corrupted or a wrong page was read"); - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); Invalidate(errlist,false); return false; } @@ -481,7 +481,7 @@ public: { if ( ! m_RecordSpace.UseNextPart(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } if ( m_PAM.GetPage (m_RecordSpace.GetCurrentPage(), PrevPageNo, errlist) ) @@ -493,7 +493,7 @@ public: errlist = errlist + Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED, "incomplete backread image"); - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); Invalidate(errlist, false); return false; } @@ -505,7 +505,7 @@ public: errlist = errlist + Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED, "incomplete backread image (prevpno): nil"); - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); Invalidate(errlist, false); return false; } @@ -520,7 +520,7 @@ public: Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED, "incomplete backread image (totalrestlength>0)"); Kernel_VTrace() << "TotalRestLength: " << TotalRestLength; - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); Invalidate(errlist, false); return false; } @@ -710,7 +710,7 @@ public: const Data_ISplitSpace::PartNo partNoOfCurrentPage = Space.CurrentPart(); if(!Space.UseNextPart(errlist)) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } PAGE &CurrentPage = Space.GetPage(partNoOfCurrentPage); @@ -718,7 +718,7 @@ public: if ( ! CurrentPage.Append (NextPage, errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } this->m_LastPageNo = NextPage.PageNo(); @@ -727,7 +727,7 @@ public: if ( CurrentPage.RootPageNo() != NextPage.RootPageNo() ) { errlist = Data_Exception(__CONTEXT__,SAPDBERR_ASSERT_STATE_FAILED,"invalid root 1"); - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } } @@ -742,7 +742,7 @@ public: if(!OldLastPage.Append (CurrentPage,errlist)) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } this->m_LastPageNo = CurrentPage.PageNo(); @@ -803,7 +803,7 @@ public: DATA_CHAIN_IS_INCONSISTENT, "-", SAPDB_ToString(this->LastPageNo()) )); - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } return true; --- V76_00_16.orig/MaxDB_ORG/sys/src/SAPDB/DataAccess/Data_ChainSplitSpaceForwardRead.hpp 2005-12-31 21:37:11.000000000 +0100 +++ V76_00_16/MaxDB_ORG/sys/src/SAPDB/DataAccess/Data_ChainSplitSpaceForwardRead.hpp 2005-12-31 21:39:48.000000000 +0100 @@ -97,7 +97,7 @@ public: { if(!Invalidate(errlist)) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } m_RecordSpace.Delete(); @@ -126,7 +126,7 @@ public: // PTS 1117126 UH 2002-08-07 removed UndoLastReservedSpace if(!m_RecordSpace.Deassign(errlist,isOK)) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } return true; @@ -171,7 +171,7 @@ public: m_BreakInfo.lastAccessMode = m_RecordSpace.GetPage(0).AccessMode(); if ( ! Invalidate(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } return true; @@ -185,11 +185,11 @@ public: WriteToTrace ("Continue(): IsValid() is true"); if ( ! Invalidate(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist,"ForwardRead::Continue() could not invalidate record space"); + this->AppendContextInfo(__CONTEXT__,errlist,"ForwardRead::Continue() could not invalidate record space"); return false; } m_BreakInfo = BreakInfo(); - AppendContextInfo(__CONTEXT__,errlist,"ForwardRead::Continue() call without break"); + this->AppendContextInfo(__CONTEXT__,errlist,"ForwardRead::Continue() call without break"); return false; } @@ -198,7 +198,7 @@ public: m_BreakInfo.lastAccessMode, errlist ) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); m_BreakInfo = BreakInfo(); (void)Invalidate(errlist); return false; // PTS 1115056 UH 2002-03-27 changed the assertion to return value @@ -208,7 +208,7 @@ public: (void) this->Deref(result,errlist); if ( ! result ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); m_BreakInfo = BreakInfo(); return false; // PTS 1115056 UH 2002-03-27 changed the assertion to return value } @@ -229,7 +229,7 @@ public: { result = AssignRecordspace (m_RecordIterator, errlist); if (! result) - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); } return m_RecordSpace; } @@ -253,7 +253,7 @@ public: // reorder and reassign the split record space if ( ! m_RecordSpace.Reassign(errlist)) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); WriteToTrace("! m_RecordSpace.Reassign"); return false; } @@ -275,7 +275,7 @@ public: if ( ! m_PAM.ReleasePage(Page, errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); WriteToTrace("! m_PAM.ReleasePage"); return false; } @@ -286,7 +286,7 @@ public: DATA_CHAIN_IS_INCONSISTENT, SAPDB_ToString(auxPageNo), SAPDB_ToString(Page.PageNo()) ); - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); WriteToTrace("! m_PAM.GetPage"); return false; } @@ -297,7 +297,7 @@ public: { if ( ! m_RecordSpace.Deassign (errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); WriteToTrace("! m_RecordSpace.Deassign"); return false; } @@ -352,7 +352,7 @@ public: { if(!m_RecordSpace.Reassign(errlist)) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } } @@ -360,13 +360,13 @@ public: { if (!m_RecordSpace.Deassign(errlist)) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } m_RecordSpace.SetAccessMode(AccessMode); if ( ! m_RecordSpace.UseNextPart(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } if ( ! m_PAM.GetPage ( m_RecordSpace.GetCurrentPage(), @@ -374,7 +374,7 @@ public: AccessMode, errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } } @@ -384,7 +384,7 @@ public: m_RecordSpace.SetAccessMode(AccessMode); if ( ! m_RecordSpace.UseNextPart(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } if ( ! m_PAM.GetPage ( m_RecordSpace.GetCurrentPage(), @@ -392,7 +392,7 @@ public: AccessMode, errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } } @@ -445,13 +445,13 @@ public: errlist = Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT, SAPDB_ToString(m_RecordSpace.GetCurrentPage().PageNo()), SAPDB_ToString(NextPageNo) ); - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); WriteToTrace("! NextPageNo.IsValid()"); return false; } if ( ! m_RecordSpace.UseNextPart(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); WriteToTrace("! m_RecordSpace.UseNextPart(errlist)"); return false; } @@ -460,7 +460,7 @@ public: errlist = Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT, SAPDB_ToString(m_RecordSpace.GetCurrentPage().PageNo()), SAPDB_ToString(NextPageNo) ); - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); WriteToTrace("! m_PAM.GetPage"); return false; } @@ -473,7 +473,7 @@ public: errlist = Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT, "TotalRestLength", SAPDB_ToString(TotalRestLength)); - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); WriteToTrace("TotalRestLength != 0"); return false; } @@ -584,19 +584,19 @@ public: if ( ! RecordIterator.Invalidate(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } if ( ! this->FindLastPageNo(errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } if ( ! RecordIterator.Assign( this->LastPageNo(), SAPDB_MAX_UINT2, Data_ForUpdate, errlist ) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); errlist = errlist + Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT, "-", SAPDB_ToString(this->LastPageNo()) ); @@ -613,12 +613,12 @@ public: { if(!RecordIterator.Invalidate(errlist)) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } if ( ! RecordIterator.Assign( this->LastPageNo(), SAPDB_MAX_UINT2, Data_ForStructureChange, errlist ) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); errlist = errlist + Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT, "-", SAPDB_ToString(this->LastPageNo()) ); @@ -664,7 +664,7 @@ public: if(!Space.UseNextPart(errlist)) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } @@ -673,7 +673,7 @@ public: if(!CurrentPage.Append (NextPage, errlist)) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } this->m_LastPageNo = NextPage.PageNo(); @@ -690,7 +690,7 @@ public: OldLastPage.Assign (CurrentPage); if(!OldLastPage.Append (CurrentPage,errlist)) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); return false; } this->m_LastPageNo = CurrentPage.PageNo(); @@ -723,7 +723,7 @@ public: { if ( ! RecordIterator.Assign( this->RootId().PageNo(), 0, AccessMode, errlist) ) { - AppendContextInfo(__CONTEXT__,errlist); + this->AppendContextInfo(__CONTEXT__,errlist); errlist = errlist + Data_Exception(__CONTEXT__,DATA_CHAIN_IS_INCONSISTENT, "-",SAPDB_ToString(this->RootId().PageNo())); return false; --- V76_00_16.orig/MaxDB_ORG/sys/src/SAPDB/RunTime/System/RTESys_AtomicOperation.c 2006-01-03 00:15:03.000000000 +0100 +++ V76_00_16/MaxDB_ORG/sys/src/SAPDB/RunTime/System/RTESys_AtomicOperation.c 2006-01-03 00:16:08.000000000 +0100 @@ -398,7 +398,7 @@ SAPDB_Bool RTESys_CmpxchgInt8( SAPDB_Int "m"(resultHigh), "m"(resultLow), "m"(resultHigh) - : "eax", "ebx", "ecx", "edx", "memory" + : "eax", "ecx", "edx", "memory" ); *pOldValue = (SAPDB_Int8)(resultLow | (( ((SAPDB_UInt8)resultHigh) << 32 ))); return ( expectedValue == (*pOldValue) ); @@ -450,7 +450,7 @@ SAPDB_Bool RTESys_CmpxchgUInt8( SAPDB_UI "m"(resultHigh), "m"(resultLow), "m"(resultHigh) - : "eax", "ebx", "ecx", "edx", "memory" + : "eax", "ecx", "edx", "memory" ); *pOldValue = resultLow | (( ((SAPDB_UInt8)resultHigh) << 32 )); #endif