summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2018-11-26 17:24:35 +0100
committerCorinna Vinschen <corinna@vinschen.de>2018-11-26 17:59:10 +0100
commit65091f0f35b29d5a043630fd877f0314a0779fb6 (patch)
tree864375b9562e2fd4cc457b9ceda79bc561d5ea9b
parenta094c5bafa02ac778c42ac3d85cd167fa44d88c9 (diff)
downloadcygnal-65091f0f35b29d5a043630fd877f0314a0779fb6.tar.gz
cygnal-65091f0f35b29d5a043630fd877f0314a0779fb6.tar.bz2
cygnal-65091f0f35b29d5a043630fd877f0314a0779fb6.zip
Cygwin: timers: Simplify hires_ms and hires_ns
Drop hires_base and move inited into hires_ns. Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
-rw-r--r--winsup/cygwin/hires.h11
-rw-r--r--winsup/cygwin/times.cc2
2 files changed, 2 insertions, 11 deletions
diff --git a/winsup/cygwin/hires.h b/winsup/cygwin/hires.h
index 04ee6066a..d07bf394d 100644
--- a/winsup/cygwin/hires.h
+++ b/winsup/cygwin/hires.h
@@ -38,16 +38,9 @@ details. */
/* # of millisecs per second. */
#define MSPERSEC (1000L)
-class hires_base
+class hires_ns
{
- protected:
int inited;
- public:
- void reset() {inited = false;}
-};
-
-class hires_ns : public hires_base
-{
LARGE_INTEGER primed_pc;
double freq;
void prime ();
@@ -57,7 +50,7 @@ class hires_ns : public hires_base
LONGLONG resolution();
};
-class hires_ms : public hires_base
+class hires_ms
{
public:
LONGLONG nsecs ();
diff --git a/winsup/cygwin/times.cc b/winsup/cygwin/times.cc
index 11fb8f257..e89051407 100644
--- a/winsup/cygwin/times.cc
+++ b/winsup/cygwin/times.cc
@@ -120,8 +120,6 @@ settimeofday (const struct timeval *tv, const struct timezone *tz)
st.wMilliseconds = tv->tv_usec / (USPERSEC / MSPERSEC);
res = -!SetSystemTime (&st);
- gtod.reset ();
-
if (res)
set_errno (EPERM);
}