Commit 1fa2a553 authored by thomas.forbriger's avatar thomas.forbriger Committed by thomas.forbriger
Browse files

further cunstructor resolution conflict resolved

This is a legacy commit from before 2015-03-01.
It may be incomplete as well as inconsistent.
See COPYING.legacy and README.history for details.


SVN Path:     http://gpitrsvn.gpi.uni-karlsruhe.de/repos/TFSoftware/trunk
SVN Revision: 1468
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parent 2f0a571b
/* this is <base_constr.cc>
* ----------------------------------------------------------------------------
*
* $Id: base_constr.cc,v 1.10 2004-02-02 09:28:45 tforb Exp $
* $Id: base_constr.cc,v 1.11 2004-02-02 09:37:13 tforb Exp $
*
* 09/08/2000 by Thomas Forbriger (IfG Stuttgart)
*
......@@ -59,7 +59,7 @@ TAbsoluteTime now()
TRelativeTime double2time(const double& seconds)
{
time_kernel::time_Ts thetime_Ts;
time_kernel::time_Ts thetime_Ts(TRelativeTime(0));
double remain=seconds;
typedef long int li;
thetime_Ts.second=li(seconds);
......
/* this is <libtime++.h>
* ----------------------------------------------------------------------------
*
* $Id: libtime++.h,v 2.13 2004-02-02 09:28:44 tforb Exp $
* $Id: libtime++.h,v 2.14 2004-02-02 09:37:13 tforb Exp $
*
* Copyright (c) by Thomas Forbriger (IfG Stuttgart)
*
......@@ -30,7 +30,7 @@
#ifndef TF_LIBTIME_H_
#define TF_LIBTIME_H_ \
"$Id: libtime++.h,v 2.13 2004-02-02 09:28:44 tforb Exp $";
"$Id: libtime++.h,v 2.14 2004-02-02 09:37:13 tforb Exp $";
#include <string>
#include "libtime.h"
......@@ -130,9 +130,9 @@ class TRelativeTime: public TBaseClassTime {
TRelativeTime(const std::string &Itimestring);
TRelativeTime(char *Itimestring);
TRelativeTime(const time_kernel::time_Ts &Itime_Ts);
TRelativeTime(const long int &days=0, const long int &hour=0,
const long int &minute=0, const long int &second=0,
const long int &milsec=0, const long int &micsec=0);
TRelativeTime(const int &days=0, const int &hour=0,
const int &minute=0, const int &second=0,
const int &milsec=0, const int &micsec=0);
long int days() const;
void nfit(const TRelativeTime &delta, long int &n, TRelativeTime &full)
......@@ -323,10 +323,10 @@ inline TRelativeTime::TRelativeTime(const time_kernel::time_Ts &Itime_Ts):
TBaseClassTime(Itime_Ts)
{ Mtime_Ts.year=0; norm(); }
inline TRelativeTime::TRelativeTime(const long int &days,
const long int &hour,
const long int &minute, const long int &second,
const long int &milsec, const long int &micsec):
inline TRelativeTime::TRelativeTime(const int &days,
const int &hour,
const int &minute, const int &second,
const int &milsec, const int &micsec):
TBaseClassTime(0, days, hour, minute, second, milsec, micsec)
{ norm(); }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment