diff --git a/headers/libs/linprog/LinearSpec.h b/headers/libs/linprog/LinearSpec.h index 43ca89cb98..826be7bc50 100644 --- a/headers/libs/linprog/LinearSpec.h +++ b/headers/libs/linprog/LinearSpec.h @@ -87,7 +87,7 @@ public: SummandList* ObjectiveFunction(); //! Caller takes ownership of the Summand's and the SummandList. - SummandList* ReplaceObjectiveFunction( + SummandList* SwapObjectiveFunction( SummandList* objFunction); void SetObjectiveFunction(SummandList* objFunction); void UpdateObjectiveFunction(); diff --git a/src/libs/alm/ALMLayout.cpp b/src/libs/alm/ALMLayout.cpp index 7e5186a95c..4f94ee0c07 100644 --- a/src/libs/alm/ALMLayout.cpp +++ b/src/libs/alm/ALMLayout.cpp @@ -818,7 +818,7 @@ BALMLayout::_CalculateMinSize() SummandList* newObjFunction = new SummandList(2); newObjFunction->AddItem(new Summand(1.0, fRight)); newObjFunction->AddItem(new Summand(1.0, fBottom)); - SummandList* oldObjFunction = fSolver.ReplaceObjectiveFunction( + SummandList* oldObjFunction = fSolver.SwapObjectiveFunction( newObjFunction); _SolveLayout(); fSolver.SetObjectiveFunction(oldObjFunction); @@ -847,7 +847,7 @@ BALMLayout::_CalculateMaxSize() SummandList* newObjFunction = new SummandList(2); newObjFunction->AddItem(new Summand(-1.0, fRight)); newObjFunction->AddItem(new Summand(-1.0, fBottom)); - SummandList* oldObjFunction = fSolver.ReplaceObjectiveFunction( + SummandList* oldObjFunction = fSolver.SwapObjectiveFunction( newObjFunction); _SolveLayout(); fSolver.SetObjectiveFunction(oldObjFunction); diff --git a/src/libs/linprog/LinearSpec.cpp b/src/libs/linprog/LinearSpec.cpp index 15e6a48970..98acae1160 100644 --- a/src/libs/linprog/LinearSpec.cpp +++ b/src/libs/linprog/LinearSpec.cpp @@ -422,7 +422,7 @@ LinearSpec::ObjectiveFunction() SummandList* -LinearSpec::ReplaceObjectiveFunction(SummandList* objFunction) +LinearSpec::SwapObjectiveFunction(SummandList* objFunction) { SummandList* list = fObjFunction; fObjFunction = objFunction; diff --git a/src/tests/libs/alm/Jamfile b/src/tests/libs/alm/Jamfile index df3d16b3a5..da0fef20eb 100644 --- a/src/tests/libs/alm/Jamfile +++ b/src/tests/libs/alm/Jamfile @@ -1,7 +1,5 @@ SubDir HAIKU_TOP src tests libs alm ; -SetSubDirSupportedPlatformsBeOSCompatible ; - UseLibraryHeaders lp_solve linprog alm ; UsePrivateHeaders shared ;