summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Nathan Woods <npwoods@mess.org>2016-09-25 13:31:46 -0400
committer Nathan Woods <npwoods@mess.org>2016-09-25 13:31:46 -0400
commitc87e7953faf7d5382d2193d1836cc0d6263b8d99 (patch)
tree50e67c33c8a225840248cf3531a0ea93d651d884
parentf83fce0c281cb0b13a323860c8995ae84d3fcb4a (diff)
Changing bad_alloc catch declarations
-rw-r--r--src/tools/imgtool/iflopimg.cpp2
-rw-r--r--src/tools/imgtool/modules/amiga.cpp2
-rw-r--r--src/tools/imgtool/modules/pc_hard.cpp2
-rw-r--r--src/tools/imgtool/modules/thomson.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/imgtool/iflopimg.cpp b/src/tools/imgtool/iflopimg.cpp
index fb0688390df..f8a85b17f81 100644
--- a/src/tools/imgtool/iflopimg.cpp
+++ b/src/tools/imgtool/iflopimg.cpp
@@ -209,7 +209,7 @@ static imgtoolerr_t imgtool_floppy_read_sector(imgtool_image *image, UINT32 trac
// resize the buffer accordingly
try { buffer.resize(sector_size); }
- catch (std::bad_alloc& b) { return IMGTOOLERR_OUTOFMEMORY; }
+ catch (std::bad_alloc const &) { return IMGTOOLERR_OUTOFMEMORY; }
// and read the sector
ferr = floppy_read_sector(imgtool_floppy(image), head, track, sector, 0, &buffer[0], sector_size);
diff --git a/src/tools/imgtool/modules/amiga.cpp b/src/tools/imgtool/modules/amiga.cpp
index 9c3dd3d1001..9b6a3697c91 100644
--- a/src/tools/imgtool/modules/amiga.cpp
+++ b/src/tools/imgtool/modules/amiga.cpp
@@ -1819,7 +1819,7 @@ static imgtoolerr_t amiga_image_read_sector(imgtool_image* img,
UINT32 track, UINT32 head, UINT32 sector, std::vector<UINT8> &buffer)
{
try { buffer.resize(BSIZE); }
- catch (std::bad_alloc& b) { return IMGTOOLERR_OUTOFMEMORY; }
+ catch (std::bad_alloc const &) { return IMGTOOLERR_OUTOFMEMORY; }
return amiga_image_read_sector(img, track, head, sector, &buffer[0], buffer.size());
}
diff --git a/src/tools/imgtool/modules/pc_hard.cpp b/src/tools/imgtool/modules/pc_hard.cpp
index b4cc315f04a..8f83902158b 100644
--- a/src/tools/imgtool/modules/pc_hard.cpp
+++ b/src/tools/imgtool/modules/pc_hard.cpp
@@ -347,7 +347,7 @@ static imgtoolerr_t pc_chd_image_readsector(imgtool_image *image, UINT32 track,
// get the sector size and resize the buffer
UINT32 sector_size = imghd_get_header(&info->hard_disk)->sectorbytes;
try { buffer.resize(sector_size); }
- catch (std::bad_alloc& b) { return IMGTOOLERR_OUTOFMEMORY; }
+ catch (std::bad_alloc const &) { return IMGTOOLERR_OUTOFMEMORY; }
// read the data
return imghd_read(&info->hard_disk,
diff --git a/src/tools/imgtool/modules/thomson.cpp b/src/tools/imgtool/modules/thomson.cpp
index a272b590a5e..0b8875408bf 100644
--- a/src/tools/imgtool/modules/thomson.cpp
+++ b/src/tools/imgtool/modules/thomson.cpp
@@ -812,7 +812,7 @@ static imgtoolerr_t thom_read_sector(imgtool_image* img, UINT32 track,
// resize the buffer
try { buffer.resize(f->sector_size); }
- catch (std::bad_alloc& b) { return IMGTOOLERR_OUTOFMEMORY; }
+ catch (std::bad_alloc const &) { return IMGTOOLERR_OUTOFMEMORY; }
memcpy( &buffer[0], thom_get_sector( f, head, track, sector ), f->sector_size);
return IMGTOOLERR_SUCCESS;