always use the atomic class from the standard library

README.md

@@ -18,6 +18,9 @@ Pre-compiled *old* versions of DSSP are available from the
 
 ### Pre-requisites
 
+Compiler:
+* Must support at least the c++ 11 standard.
+
 System libraries:
 
 * libzeep version >= 3.0 (for mkhssp --fetch-dbrefs only)

src/progress.cpp

@@ -29,47 +29,13 @@
 #include "progress.h"
 
 
-#ifdef _MSC_VER
-
-#include <Windows.h>
-
-uint32 get_terminal_width()
-{
- return TERM_WIDTH;
-}
-
-int64 MCounter::operator++(int)
-{
- return ::InterlockedExchangeAdd64(&m_value, 1);
-}
-
-int64 MCounter::operator+=(int64 inValue)
-{
- return ::InterlockedExchangeAdd64(&m_value, inValue);
-}
-
-int64 MCounter::operator=(int64 inValue)
-{
- ::InterlockedExchange64(&m_value, inValue);
- return inValue;
-}
-
-// --------------------------------------------------------------------
-
-#define STDOUT_FILENO 1
-bool isatty(int) { return true; }
-
-#else
-
 uint32 get_terminal_width()
 {
  struct winsize w;
  ioctl(0, TIOCGWINSZ, &w);
  return w.ws_col;
 }
 
-#endif
-
 struct MProgressImpl
 {
  MProgressImpl(int64 inMax, const std::string& inAction)

src/progress.h

@@ -6,40 +6,8 @@
 
 #pragma once
 
-#if defined(__linux__)
-
-#if defined(__INTEL_COMPILER_BUILD_DATE) || \
- (defined(__GNUC__) && (__GNUC__ > 4 || \
- ( __GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
 #include <atomic>
 typedef std::atomic<int64> MCounter;
-#else
-#include <boost/detail/atomic_count.hpp>
-typedef boost::detail::atomic_count MCounter;
-#endif
-
-#else
-
-struct MCounter
-{
- MCounter(int64 inValue) : m_value(inValue) {}
-
- operator int64() const { return m_value; }
-
- int64 operator++(int);
- int64 operator+=(int64 inValue);
- int64 operator=(int64 inValue);
-
- int64 m_value;
-};
-
-
-//typedef int64 MCounter;
-//
-//int64 add(MCounter& ioCounter, int64 inIncrement);
-//int64 set(MCounter& ioCounter, int64 inValue);
-
-#endif
 
 // --------------------------------------------------------------------