Skip to content

Commit

Permalink
Fixed build error due to missing _NOEXCEPT macro
Browse files Browse the repository at this point in the history
Recent versions of Visual Studio replaced the old macro with
the C++11 noexcept keyword.
  • Loading branch information
simonowen committed Dec 2, 2018
1 parent 6b22550 commit 7a6f882
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 1 addition & 5 deletions ReadMe.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# SAMdisk


## Introduction

[SAMdisk](http://simonowen.com/samdisk/) is a portable disk image utility. It specialises in reading and writing most PC-compatible floppy media, including many copy-protected formats.


## Development

This code base is still very much a work in progress, and expected to be **incomplete** and **buggy** for a little while longer.
Expand All @@ -14,10 +12,9 @@ Despite being based on the SAMdisk 3 source code, the disk core has been complet

Once the missing functionality has been restored it will be released officially as SAMdisk 4.0.


## System Requirements

The current code builds under Windows, Linux and macOS, and should be portable to other systems. Building requires a C++ compiler with C++14 support, such as Visual Studio 2017, g++ 4.9+, or Clang 3.6+.
The [latest code](https://github.com/simonowen/samdisk/) builds under Windows, Linux and macOS, and should be portable to other systems. Building requires a C++ compiler with C++14 support, such as Visual Studio 2017, g++ 4.9+, or Clang 3.6+.

All platforms can use the [CMake](https://cmake.org/) build system. A number of optional libraries are used if they are available at configuration time. Use `cmake -DCMAKE_BUILD_TARGET=Release .` to create the build scripts then `make` to build.

Expand All @@ -31,7 +28,6 @@ The provided Visual Studio 2017 project file expects all libraries mentioned abo

The SAMdisk source code is released under the [MIT license](https://tldrlegal.com/license/mit-license).


## Contact

Simon Owen
Expand Down
2 changes: 1 addition & 1 deletion include/win32_error.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ std::string GetWin32ErrorStr (DWORD error_code = 0, bool english = false);
class win32_category_impl : public std::error_category
{
public:
const char* name () const _NOEXCEPT override { return "win32"; };
const char* name () const noexcept override { return "win32"; };
std::string message (int error_code) const override { return GetWin32ErrorStr(error_code); }
};

Expand Down

0 comments on commit 7a6f882

Please sign in to comment.