diff --git a/cmake/version.cmake b/cmake/version.cmake index 21d9b8d..aa99773 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -4,7 +4,7 @@ set (TK_UTIL_MAJOR_VERSION "6") set (TK_UTIL_MINOR_VERSION "13") -set (TK_UTIL_RELEASE_VERSION "0") +set (TK_UTIL_RELEASE_VERSION "1") set (TK_UTIL_VERSION ${TK_UTIL_MAJOR_VERSION}.${TK_UTIL_MINOR_VERSION}.${TK_UTIL_RELEASE_VERSION}) set (TK_UTIL_SCRIPTING_MAJOR_VERSION ${TK_UTIL_MAJOR_VERSION}) diff --git a/src/TkUtil/public/TkUtil/UTF8String.h b/src/TkUtil/public/TkUtil/UTF8String.h index 46277e3..b3b2d22 100644 --- a/src/TkUtil/public/TkUtil/UTF8String.h +++ b/src/TkUtil/public/TkUtil/UTF8String.h @@ -210,18 +210,16 @@ class UTF8String { public : +#ifndef SWIG friend UTF8String& operator << (UTF8String& u8str, Charset::CHARSET); friend UTF8String& operator << (UTF8String& u8str, const Charset&); friend UTF8String& operator << (UTF8String& u8str, setw width); - friend UTF8String& operator << ( - UTF8String& u8str, setprecision prec); - friend UTF8String& operator << ( - UTF8String& u8str, IN_STD ios_base::fmtflags); - friend UTF8String operator + ( - const UTF8String& us, const IN_STD string& str); + friend UTF8String& operator << (UTF8String& u8str, setprecision prec); + friend UTF8String& operator << (UTF8String& u8str, IN_STD ios_base::fmtflags); + friend UTF8String operator + (const UTF8String& us, const IN_STD string& str); friend UTF8String operator + (const UTF8String& us, const char* str); friend UTF8String operator + (const UTF8String& us1, const UTF8String& us2); - +#endif // SWIG /** *
@@ -795,6 +793,7 @@ class ConsoleOutput // v 4.2.0 const TkUtil::Charset& getCharset ( ) const { return _charset; } +#ifndef SWIG ConsoleOutput& operator << (const TkUtil::UTF8String&); ConsoleOutput& operator << (unsigned long); ConsoleOutput& operator << (double); @@ -807,6 +806,7 @@ class ConsoleOutput // v 4.2.0 friend ConsoleOutput& co_endl (ConsoleOutput&); ConsoleOutput& operator << (ConsoleOutput& (*pf)(ConsoleOutput&)) { return pf (*this); } // Pour endl et autres manipulateurs. +#endif // SWIG /** * @return Une référence sur la sortie standard. @@ -836,10 +836,11 @@ class ConsoleOutput // v 4.2.0 TkUtil::Charset _charset; }; // class ConsoleOutput +#ifndef SWIG ConsoleOutput& operator << (ConsoleOutput&, std::_Setprecision); ConsoleOutput& operator << (ConsoleOutput&, std::_Setw); ConsoleOutput& co_endl (ConsoleOutput&); - +#endif // SWIG //END_NAMESPACE_UTIL diff --git a/versions.txt b/versions.txt index 0d71abf..3deb45b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,3 +1,9 @@ +Version 6.13.1 : 20/06/25 +================= + +Portage Swig v 4.3.* + + Version 6.13.0 : 14/03/25 =================