Skip to content

Commit 7a6f882

Browse files
committed
Fixed build error due to missing _NOEXCEPT macro
Recent versions of Visual Studio replaced the old macro with the C++11 noexcept keyword.
1 parent 6b22550 commit 7a6f882

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

ReadMe.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
# SAMdisk
22

3-
43
## Introduction
54

65
[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.
76

8-
97
## Development
108

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

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

17-
1815
## System Requirements
1916

20-
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+.
17+
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+.
2118

2219
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.
2320

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

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

34-
3531
## Contact
3632

3733
Simon Owen

include/win32_error.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ std::string GetWin32ErrorStr (DWORD error_code = 0, bool english = false);
99
class win32_category_impl : public std::error_category
1010
{
1111
public:
12-
const char* name () const _NOEXCEPT override { return "win32"; };
12+
const char* name () const noexcept override { return "win32"; };
1313
std::string message (int error_code) const override { return GetWin32ErrorStr(error_code); }
1414
};
1515

0 commit comments

Comments
 (0)