From: John Wolfe <jwolfe@vmware.com>
Date: Thu, 4 Mar 2021 21:48:46 +0000 (-0800)
Subject: stringxx: Replace usage of deprecated glibmm function
X-Git-Tag: stable-11.3.0~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e239a31df9563c38ffbc0468deb1018b52334e02;p=thirdparty%2Fopen-vm-tools.git

stringxx: Replace usage of deprecated glibmm function

Glibmm::RefPtr::clear() has been deprecated for a while and was removed in
2.51. The reasoning is listed in the 2.44 header:

"/// @deprecated Use reset() instead because this leads to confusion with
clear() methods on the underlying class."

reset() has been available since 2.16, so it is trivial to switch to it.
---

diff --git a/open-vm-tools/services/plugins/dndcp/stringxx/ubstr_t.hh b/open-vm-tools/services/plugins/dndcp/stringxx/ubstr_t.hh
index 1558db865..df08fb8d6 100644
--- a/open-vm-tools/services/plugins/dndcp/stringxx/ubstr_t.hh
+++ b/open-vm-tools/services/plugins/dndcp/stringxx/ubstr_t.hh
@@ -863,7 +863,7 @@ ubstr_t::GetUTF8Cache()
 inline void
 ubstr_t::InvalidateCache()
 {
-   mUTF8.clear();
+   mUTF8.reset();
 }