message: drop duplicate class/function definitions intorduced by automated conflict resolution
diff: @@ -173,60 +173,6 @@ public:
  -// a secure (but partial) alternative for sscanf
  -// see example usage in pcm-core.cpp
  -typedef std::istringstream pcm_sscanf;
  -
  -class s_expect : public std::string
  -{
  -public:
  - explicit s_expect(const char * s) : std::string(s) {}
  - explicit s_expect(const std::string & s) : std::string(s) {}
  - friend std::istream & operator >> (std::istream & istr, s_expect && s);
  - friend std::istream & operator >> (std::istream && istr, s_expect && s);
  -private:
  -
  - void match(std::istream & istr) const
  - {
  - istr >> std::noskipws;
  - const auto len = length();
  - char * buffer = new char[len + 2];
  - buffer[0] = 0;
  - istr.get(buffer, len+1);
  - if (*this != std::string(buffer))
  - {
  - istr.setstate(std::ios_base::failbit);
  - }
  - delete [] buffer;
  - }
  -};
  -
  -inline std::istream & operator >> (std::istream & istr, s_expect && s)
  -{
  - s.match(istr);
  - return istr;
  -}
  -
  -inline std::istream & operator >> (std::istream && istr, s_expect && s)
  -{
  - s.match(istr);
  - return istr;
  -}
  -
  -inline tm pcm_localtime()
  -{
  - time_t now = time(NULL);
  - tm result;
  -#ifdef _MSC_VER
  - localtime_s(&result, &now);
  -#else
  - localtime_r(&now, &result);
  -#endif
  - return result;
  -}
  -
  -
  -
  // a secure (but partial) alternative for sscanf
  // see example usage in pcm-core.cpp
  typedef std::istringstream pcm_sscanf;
  