Skip to content

Version 6.13.1. Swig v 4.3.* port. #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2025
Merged

Version 6.13.1. Swig v 4.3.* port. #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
17 changes: 9 additions & 8 deletions src/TkUtil/public/TkUtil/UTF8String.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
* <P>
Expand Down Expand Up @@ -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);
Expand All @@ -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.
Expand Down Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Version 6.13.1 : 20/06/25
=================

Portage Swig v 4.3.*


Version 6.13.0 : 14/03/25
=================

Expand Down