From 110a3929344d1e53eabf6af451f77bf307c9434d Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 30 Aug 2013 22:41:16 +0000 Subject: Don't add default arguments on friend definitions. --- time/glclock/distinfo | 4 ++-- time/glclock/patches/patch-MString.H | 23 +++++++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/time/glclock/distinfo b/time/glclock/distinfo index 14ce5ae1729..66282b17546 100644 --- a/time/glclock/distinfo +++ b/time/glclock/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.9 2012/01/29 15:53:27 marino Exp $ +$NetBSD: distinfo,v 1.10 2013/08/30 22:41:16 joerg Exp $ SHA1 (glclock-6.0b6.0.tar.gz) = e276a516d543c9a6c04f06cfa046f89a476a8685 RMD160 (glclock-6.0b6.0.tar.gz) = f0bd207a47a01e3dc3d3da5b107b168a3210d2a3 Size (glclock-6.0b6.0.tar.gz) = 811803 bytes SHA1 (patch-GLObject.H) = 62040251be8e6dba3d744640fdcb614eed30a306 -SHA1 (patch-MString.H) = 3d31d19c33327d6b6775d9bb7db165a8949e4fc2 +SHA1 (patch-MString.H) = ee6ea5b6a68b5fcada448741ec8382f5d26893f3 SHA1 (patch-aa) = 922d73d2c864abde5ca9a39ca27d4740ceedb616 SHA1 (patch-ab) = 8d4f12c9948d703e4fbff68282388efc7a352f59 SHA1 (patch-ac) = d06a44d725820c2988888665c4d5dd75161525b8 diff --git a/time/glclock/patches/patch-MString.H b/time/glclock/patches/patch-MString.H index 0b64e5f238a..1c414f422fb 100644 --- a/time/glclock/patches/patch-MString.H +++ b/time/glclock/patches/patch-MString.H @@ -1,6 +1,6 @@ -$NetBSD: patch-MString.H,v 1.1 2011/11/25 22:19:56 joerg Exp $ +$NetBSD: patch-MString.H,v 1.2 2013/08/30 22:41:16 joerg Exp $ ---- MString.H.orig 2011-11-25 18:07:40.000000000 +0000 +--- MString.H.orig 2000-06-22 14:58:26.000000000 +0000 +++ MString.H @@ -66,7 +66,7 @@ #ifndef ___STRING_H___ @@ -19,3 +19,22 @@ $NetBSD: patch-MString.H,v 1.1 2011/11/25 22:19:56 joerg Exp $ //#define STRING_DEBUG +@@ -307,15 +308,15 @@ class String + + // m 文字目から n 文字 + String& Mid(int m, int n = 1) ; +- friend String Mid(String s, int m, int n = 1) ; ++ friend String Mid(String s, int m, int n) ; + + // 左から n 文字 + String& Left(int n = 1) ; +- friend String Left(const String& s, int n = 1) ; ++ friend String Left(const String& s, int n) ; + + // 右から n 文字 + String& Right(int n = 1) ; +- friend String Right(const String& s, int n = 1) ; ++ friend String Right(const String& s, int n) ; + + String FileDirectory() const ; + String FileNamePart() const ; -- cgit v1.2.3