Skip to content

Commit 6fa8109

Browse files
author
Charles PIGNEROL
committed
Version 6.13.1. Swig v 4.3.* port.
1 parent 61e3131 commit 6fa8109

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

cmake/version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
set (TK_UTIL_MAJOR_VERSION "6")
66
set (TK_UTIL_MINOR_VERSION "13")
7-
set (TK_UTIL_RELEASE_VERSION "0")
7+
set (TK_UTIL_RELEASE_VERSION "1")
88
set (TK_UTIL_VERSION ${TK_UTIL_MAJOR_VERSION}.${TK_UTIL_MINOR_VERSION}.${TK_UTIL_RELEASE_VERSION})
99

1010
set (TK_UTIL_SCRIPTING_MAJOR_VERSION ${TK_UTIL_MAJOR_VERSION})

src/TkUtil/public/TkUtil/UTF8String.h

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,18 +210,16 @@ class UTF8String
210210
{
211211
public :
212212

213+
#ifndef SWIG
213214
friend UTF8String& operator << (UTF8String& u8str, Charset::CHARSET);
214215
friend UTF8String& operator << (UTF8String& u8str, const Charset&);
215216
friend UTF8String& operator << (UTF8String& u8str, setw width);
216-
friend UTF8String& operator << (
217-
UTF8String& u8str, setprecision prec);
218-
friend UTF8String& operator << (
219-
UTF8String& u8str, IN_STD ios_base::fmtflags);
220-
friend UTF8String operator + (
221-
const UTF8String& us, const IN_STD string& str);
217+
friend UTF8String& operator << (UTF8String& u8str, setprecision prec);
218+
friend UTF8String& operator << (UTF8String& u8str, IN_STD ios_base::fmtflags);
219+
friend UTF8String operator + (const UTF8String& us, const IN_STD string& str);
222220
friend UTF8String operator + (const UTF8String& us, const char* str);
223221
friend UTF8String operator + (const UTF8String& us1, const UTF8String& us2);
224-
222+
#endif // SWIG
225223

226224
/**
227225
* <P>
@@ -795,6 +793,7 @@ class ConsoleOutput // v 4.2.0
795793
const TkUtil::Charset& getCharset ( ) const
796794
{ return _charset; }
797795

796+
#ifndef SWIG
798797
ConsoleOutput& operator << (const TkUtil::UTF8String&);
799798
ConsoleOutput& operator << (unsigned long);
800799
ConsoleOutput& operator << (double);
@@ -807,6 +806,7 @@ class ConsoleOutput // v 4.2.0
807806
friend ConsoleOutput& co_endl (ConsoleOutput&);
808807
ConsoleOutput& operator << (ConsoleOutput& (*pf)(ConsoleOutput&))
809808
{ return pf (*this); } // Pour endl et autres manipulateurs.
809+
#endif // SWIG
810810

811811
/**
812812
* @return Une référence sur la sortie standard.
@@ -836,10 +836,11 @@ class ConsoleOutput // v 4.2.0
836836
TkUtil::Charset _charset;
837837
}; // class ConsoleOutput
838838

839+
#ifndef SWIG
839840
ConsoleOutput& operator << (ConsoleOutput&, std::_Setprecision);
840841
ConsoleOutput& operator << (ConsoleOutput&, std::_Setw);
841842
ConsoleOutput& co_endl (ConsoleOutput&);
842-
843+
#endif // SWIG
843844

844845

845846
//END_NAMESPACE_UTIL

versions.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Version 6.13.1 : 20/06/25
2+
=================
3+
4+
Portage Swig v 4.3.*
5+
6+
17
Version 6.13.0 : 14/03/25
28
=================
39

0 commit comments

Comments
 (0)