From 97aaa0f97940065233334cfb8eaf5d672ac6dfda Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Wed, 19 Oct 2016 15:57:28 +0900 Subject: [PATCH] Restore the ABI breakage by bringing back a removed private static variable. --- taglib/toolkit/tstring.cpp | 6 ++++++ taglib/toolkit/tstring.h | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp index 01a69266..83287905 100644 --- a/taglib/toolkit/tstring.cpp +++ b/taglib/toolkit/tstring.cpp @@ -787,6 +787,12 @@ void String::detach() if(d->count() > 1) String(d->data.c_str()).swap(*this); } + +//////////////////////////////////////////////////////////////////////////////// +// private members +//////////////////////////////////////////////////////////////////////////////// + +const String::Type String::WCharByteOrder = wcharByteOrder(); } //////////////////////////////////////////////////////////////////////////////// diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h index 97e9ff66..b1be04b8 100644 --- a/taglib/toolkit/tstring.h +++ b/taglib/toolkit/tstring.h @@ -536,6 +536,13 @@ namespace TagLib { void detach(); private: + /*! + * \deprecated This variable is no longer used, but NEVER remove this. It + * may lead to a linkage error. + */ + // BIC: remove + static const Type WCharByteOrder; + class StringPrivate; StringPrivate *d; }; -- 2.40.0