From ffc9ac65a7de4e26831a7749353a655e89ec48f2 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Mon, 14 Sep 2015 22:18:55 +0000
Subject: [PATCH] A few more fixes wrt the recent pruning for Visual Studio.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3207 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 src/common/PNGLibrary.hxx   | 4 ++--
 src/emucore/FSNode.hxx      | 6 ++----
 src/emucore/FrameBuffer.hxx | 2 --
 src/emucore/MT24LC256.cxx   | 2 +-
 src/gui/Dialog.hxx          | 4 ----
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/common/PNGLibrary.hxx b/src/common/PNGLibrary.hxx
index 882292a65..0e04c5a89 100644
--- a/src/common/PNGLibrary.hxx
+++ b/src/common/PNGLibrary.hxx
@@ -146,8 +146,8 @@ class PNGLibrary
     static void png_read_data(png_structp ctx, png_bytep area, png_size_t size);
     static void png_write_data(png_structp ctx, png_bytep area, png_size_t size);
     static void png_io_flush(png_structp ctx);
-    static void png_user_warn[[noreturn]] (png_structp ctx, png_const_charp str);
-    static void png_user_error[[noreturn]] (png_structp ctx, png_const_charp str);
+    static void png_user_warn(png_structp ctx, png_const_charp str);
+    static void png_user_error(png_structp ctx, png_const_charp str);
 
   private:
     // Following constructors and assignment operators not supported
diff --git a/src/emucore/FSNode.hxx b/src/emucore/FSNode.hxx
index ba9ff5eb2..25a0224f0 100644
--- a/src/emucore/FSNode.hxx
+++ b/src/emucore/FSNode.hxx
@@ -99,9 +99,7 @@ class FilesystemNode
      * Assignment operators.
      */
     FilesystemNode(const FilesystemNode&) = default;
-    FilesystemNode(FilesystemNode&&) = default;
     FilesystemNode& operator=(const FilesystemNode&) = default;
-    FilesystemNode& operator=(FilesystemNode&&) = default;
 
     /**
      * Compare the name of this node to the name of another. Directories
@@ -284,9 +282,9 @@ class AbstractFSNode
      */
     AbstractFSNode() = default;
     AbstractFSNode(const AbstractFSNode&) = default;
-    AbstractFSNode(AbstractFSNode&&) = default;
+//    AbstractFSNode(AbstractFSNode&&) = default;
     AbstractFSNode& operator=(const AbstractFSNode&) = default;
-    AbstractFSNode& operator=(AbstractFSNode&&) = default;
+//    AbstractFSNode& operator=(AbstractFSNode&&) = default;
 
     /**
      * Destructor.
diff --git a/src/emucore/FrameBuffer.hxx b/src/emucore/FrameBuffer.hxx
index b8d0f45aa..6bc090e45 100644
--- a/src/emucore/FrameBuffer.hxx
+++ b/src/emucore/FrameBuffer.hxx
@@ -450,9 +450,7 @@ class FrameBuffer
         ~VideoModeList();
 
         VideoModeList(const VideoModeList&) = default;
-        VideoModeList(VideoModeList&&) = default;
         VideoModeList& operator=(const VideoModeList&) = default;
-        VideoModeList& operator=(VideoModeList&&) = default;
 
         void add(const VideoMode& mode);
         void clear();
diff --git a/src/emucore/MT24LC256.cxx b/src/emucore/MT24LC256.cxx
index 44ed47bf3..f811aa7d1 100644
--- a/src/emucore/MT24LC256.cxx
+++ b/src/emucore/MT24LC256.cxx
@@ -78,7 +78,7 @@ MT24LC256::MT24LC256(const string& filename, const System& system)
   {
     // Get length of file; it must be 32768
     in.seekg(0, ios::end);
-    if(in.tellg() == 32768)
+    if(uInt32(in.tellg()) == 32768u)
     {
       in.seekg(0, ios::beg);
       in.read(reinterpret_cast<char*>(myData), 32768);
diff --git a/src/gui/Dialog.hxx b/src/gui/Dialog.hxx
index 044ebae2a..da1df9f9d 100644
--- a/src/gui/Dialog.hxx
+++ b/src/gui/Dialog.hxx
@@ -134,9 +134,7 @@ class Dialog : public GuiObject
       virtual ~Focus();
 
       Focus(const Focus&) = default;
-      Focus(Focus&&) = default;
       Focus& operator=(const Focus&) = default;
-      Focus& operator=(Focus&&) = default;
     };
     using FocusList = vector<Focus>;
 
@@ -149,9 +147,7 @@ class Dialog : public GuiObject
       virtual ~TabFocus();
 
       TabFocus(const TabFocus&) = default;
-      TabFocus(TabFocus&&) = default;
       TabFocus& operator=(const TabFocus&) = default;
-      TabFocus& operator=(TabFocus&&) = default;
 
       void appendFocusList(WidgetArray& list);
       void saveCurrentFocus(Widget* w);