diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 15:27:36 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-15 15:27:36 +0300 |
commit | 4ddaeb377271361f4a104774709d4ba31568e9de (patch) | |
tree | 0c19f415cb30983169a1a6aa3559b83841ee78e3 /indra/llcommon/llcommonutils.h | |
parent | 26f70456d1e9059c48d25e08fc07f893315b1f3c (diff) | |
parent | 363b89947c580e1056cb5f4ae32ebfd9eaf12a17 (diff) |
Merge pull request #1477 from secondlife/marchcat/x-c-merge
Maint X -> Maint C merge
Diffstat (limited to 'indra/llcommon/llcommonutils.h')
-rw-r--r-- | indra/llcommon/llcommonutils.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/indra/llcommon/llcommonutils.h b/indra/llcommon/llcommonutils.h index 20ada27830..5f6fd41aa3 100644 --- a/indra/llcommon/llcommonutils.h +++ b/indra/llcommon/llcommonutils.h @@ -5,21 +5,21 @@ * $LicenseInfo:firstyear=2010&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -31,21 +31,21 @@ namespace LLCommonUtils { - /** - * Computes difference between 'vnew' and 'vcur' vectors. - * Items present in 'vnew' and missing in 'vcur' are treated as added and are copied into 'vadded' - * Items missing in 'vnew' and present in 'vcur' are treated as removed and are copied into 'vremoved' - * - * @param vnew[in] - incoming IDs - * @param vcur[in] - current IDs - * @param vadded[out] - difference between incoming and current IDS - added IDs - * @param vremoved[out] - difference between incoming and current IDS - removed IDs - */ - LL_COMMON_API void computeDifference( - const uuid_vec_t& vnew, - const uuid_vec_t& vcur, - uuid_vec_t& vadded, - uuid_vec_t& vremoved); + /** + * Computes difference between 'vnew' and 'vcur' vectors. + * Items present in 'vnew' and missing in 'vcur' are treated as added and are copied into 'vadded' + * Items missing in 'vnew' and present in 'vcur' are treated as removed and are copied into 'vremoved' + * + * @param vnew[in] - incoming IDs + * @param vcur[in] - current IDs + * @param vadded[out] - difference between incoming and current IDS - added IDs + * @param vremoved[out] - difference between incoming and current IDS - removed IDs + */ + LL_COMMON_API void computeDifference( + const uuid_vec_t& vnew, + const uuid_vec_t& vcur, + uuid_vec_t& vadded, + uuid_vec_t& vremoved); }; #endif //LL_LLCOMMONUTILS_H |