Changeset f4e4fe8 in tol

Timestamp:

Feb 22, 2012, 8:51:51 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

3cb141d5

Parents:

e63f384

Message:

Fixes #1444
When optional argument n is unknown Succ returns unknown date

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4172 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/date_type/dtegra.cpp (modified) (2 diffs)

tol/btol/date_type/dtegra.cpp

@@ -307 +307 @@
 //--------------------------------------------------------------------
 {
-    BDate               dte = Date(Arg(1));
+    BDate dte = Date(Arg(1));
     BUserTimeSet* tms = Tms(Arg(2));
-    BReal               num = 1;
-    
-    if(Arg(3)) { num = Real(Arg(3)); }
-    contens_ = tms->Next(dte,(BInt)num);
+    BDat num = 1;
+    
+    if(Arg(3)) { num = Dat(Arg(3)); }
+    if(!num.IsUnknown())
+    {
+      contens_ = tms->Next(dte,(BInt)num.Value());
+    }
 }
 
@@ -327 +330 @@
 //--------------------------------------------------------------------
 {
-    BUserTimeSerie* tsr = Tsr(Arg(1));
-    contens_ = tsr->FirstDate();
+  BUserTimeSerie* tsr = Tsr(Arg(1));
+  contens_ = tsr->FirstDate();
 }