From f250e301b1b39504228bf1f8eb5fac7c8cbca326 Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Thu, 26 Mar 1998 00:34:36 +0100
Subject: [PATCH] uses inherit foo::bar
Rev: lib/modules/Calendar.pmod/Gregorian.pmod:1.9
Rev: lib/modules/Calendar.pmod/ISO.pmod:1.3
---
lib/modules/Calendar.pmod/Gregorian.pmod | 1 -
lib/modules/Calendar.pmod/ISO.pmod | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/modules/Calendar.pmod/Gregorian.pmod b/lib/modules/Calendar.pmod/Gregorian.pmod
index 0a1094a24f..801570457a 100644
--- a/lib/modules/Calendar.pmod/Gregorian.pmod
+++ b/lib/modules/Calendar.pmod/Gregorian.pmod
@@ -191,7 +191,6 @@ class Year
month_mapping=
mkmapping(Array.map(month_names,lower_case),
indices(allocate(13))[1..]);
- werror(sprintf("%O\n",month_mapping));
}
n=month_mapping[lower_case(n)];
if (!n) return 0;
diff --git a/lib/modules/Calendar.pmod/ISO.pmod b/lib/modules/Calendar.pmod/ISO.pmod
index a5046bb5c5..58f809e03d 100644
--- a/lib/modules/Calendar.pmod/ISO.pmod
+++ b/lib/modules/Calendar.pmod/ISO.pmod
@@ -1,10 +1,10 @@
// IS-8601, international standard
-inherit Calendar.Gregorian;
+inherit Calendar.Gregorian:Gregorian;
class Year
{
- inherit Calendar.Gregorian.Year;
+ inherit Gregorian::Year;
int leap_day()
{
@@ -15,7 +15,7 @@ class Year
class Week
{
- inherit Calendar.Gregorian.Week;
+ inherit Gregorian::Week;
int yday()
{
@@ -56,7 +56,7 @@ class Week
class Day
{
- inherit Calendar.Gregorian.Day;
+ inherit Gregorian::Day;
int week_day()
{
--
GitLab