ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
stephena 2015-09-14 22:18:55 +00:00
parent 2ccebc9720
commit ffc9ac65a7
5 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/PNGLibrary.hxx
View File

@ -146,8 +146,8 @@ class PNGLibrary
static void png_read_data(png_structp ctx, png_bytep area, png_size_t size); 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_write_data(png_structp ctx, png_bytep area, png_size_t size);
static void png_io_flush(png_structp ctx); 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_warn(png_structp ctx, png_const_charp str);
static void png_user_error[[noreturn]] (png_structp ctx, png_const_charp str); static void png_user_error(png_structp ctx, png_const_charp str);
private: private:
// Following constructors and assignment operators not supported // Following constructors and assignment operators not supported

6
src/emucore/FSNode.hxx
View File

@ -99,9 +99,7 @@ class FilesystemNode
* Assignment operators. * Assignment operators.
*/ */
FilesystemNode(const FilesystemNode&) = default; FilesystemNode(const FilesystemNode&) = default;
FilesystemNode(FilesystemNode&&) = default;
FilesystemNode& operator=(const FilesystemNode&) = default; FilesystemNode& operator=(const FilesystemNode&) = default;
FilesystemNode& operator=(FilesystemNode&&) = default;
/** /**
* Compare the name of this node to the name of another. Directories * Compare the name of this node to the name of another. Directories
@ -284,9 +282,9 @@ class AbstractFSNode
*/ */
AbstractFSNode() = default; AbstractFSNode() = default;
AbstractFSNode(const AbstractFSNode&) = default; AbstractFSNode(const AbstractFSNode&) = default;
AbstractFSNode(AbstractFSNode&&) = default; // AbstractFSNode(AbstractFSNode&&) = default;
AbstractFSNode& operator=(const AbstractFSNode&) = default; AbstractFSNode& operator=(const AbstractFSNode&) = default;
AbstractFSNode& operator=(AbstractFSNode&&) = default; // AbstractFSNode& operator=(AbstractFSNode&&) = default;
/** /**
* Destructor. * Destructor.

2
src/emucore/FrameBuffer.hxx
View File

@ -450,9 +450,7 @@ class FrameBuffer
~VideoModeList(); ~VideoModeList();
VideoModeList(const VideoModeList&) = default; VideoModeList(const VideoModeList&) = default;
VideoModeList(VideoModeList&&) = default;
VideoModeList& operator=(const VideoModeList&) = default; VideoModeList& operator=(const VideoModeList&) = default;
VideoModeList& operator=(VideoModeList&&) = default;
void add(const VideoMode& mode); void add(const VideoMode& mode);
void clear(); void clear();

2
src/emucore/MT24LC256.cxx
View File

@ -78,7 +78,7 @@ MT24LC256::MT24LC256(const string& filename, const System& system)
{ {
// Get length of file; it must be 32768 // Get length of file; it must be 32768
in.seekg(0, ios::end); in.seekg(0, ios::end);
if(in.tellg() == 32768) if(uInt32(in.tellg()) == 32768u)
{ {
in.seekg(0, ios::beg); in.seekg(0, ios::beg);
in.read(reinterpret_cast<char*>(myData), 32768); in.read(reinterpret_cast<char*>(myData), 32768);

4
src/gui/Dialog.hxx
View File

@ -134,9 +134,7 @@ class Dialog : public GuiObject
virtual ~Focus(); virtual ~Focus();
Focus(const Focus&) = default; Focus(const Focus&) = default;
Focus(Focus&&) = default;
Focus& operator=(const Focus&) = default; Focus& operator=(const Focus&) = default;
Focus& operator=(Focus&&) = default;
}; };
using FocusList = vector<Focus>; using FocusList = vector<Focus>;
@ -149,9 +147,7 @@ class Dialog : public GuiObject
virtual ~TabFocus(); virtual ~TabFocus();
TabFocus(const TabFocus&) = default; TabFocus(const TabFocus&) = default;
TabFocus(TabFocus&&) = default;
TabFocus& operator=(const TabFocus&) = default; TabFocus& operator=(const TabFocus&) = default;
TabFocus& operator=(TabFocus&&) = default;
void appendFocusList(WidgetArray& list); void appendFocusList(WidgetArray& list);
void saveCurrentFocus(Widget* w); void saveCurrentFocus(Widget* w);