Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ExecutionTrace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ namespace VCC::Debugger::UI { namespace
// Draw our current page of samples
SetTextColor(hdc, RGB(0, 0, 0));
int y = rect.top + 20;
int lines = ::std::min((long)currentTrace.size(), tracePage);
int lines = std::min((long)currentTrace.size(), tracePage);
for (int i = 0; i < lines; i++)
{
std::string s;
Expand Down Expand Up @@ -1100,7 +1100,7 @@ namespace VCC::Debugger::UI { namespace
EmuState.Debugger.LockTrace();
unsigned int offset = start > 1 ? start-1 : 0;
auto & _trace = EmuState.Debugger.GetTraceResult();
int count = ::std::min((unsigned int)_trace.size(), nlines);
int count = std::min((unsigned int)_trace.size(), nlines);
const size_t lineSize = 65536;
char *line = new char[lineSize];

Expand Down
4 changes: 2 additions & 2 deletions FD502/fd502.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ extern "C"

extern "C"
{
__declspec(dllexport) unsigned char PakReadMemoryByte(::std::size_t Address)
__declspec(dllexport) unsigned char PakReadMemoryByte(std::size_t Address)
{
return RomPointer[SelectRomIndex]->read_memory_byte(Address);
}
Expand Down Expand Up @@ -354,7 +354,7 @@ LRESULT CALLBACK Config(HWND hDlg, UINT message, WPARAM wParam, LPARAM /*lParam*
mount_disk_image("*Floppy B:",PhysicalDriveB-1);
}
}
SelectRomIndex = ::std::min(TempSelectRomIndex, RomPointer.size());
SelectRomIndex = std::min(TempSelectRomIndex, RomPointer.size());
RomFileName = ::vcc::utils::find_pak_module_path(TempRomFileName);
ExternalRom.load(RomFileName); //JF
BeckerAddr = ::vcc::utils::get_dialog_item_text(hDlg, IDC_BECKER_HOST);
Expand Down
2 changes: 1 addition & 1 deletion FD502/wd1793.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ static bool DirtyDisk=true;
char ImageFormat[5][4]={"JVC","VDK","DMK","OS9","RAW"};


::std::string get_mounted_disk_filename(::std::size_t drive_index)
std::string get_mounted_disk_filename(::std::size_t drive_index)
{
return Drive[drive_index].ImageName;
}
Expand Down
2 changes: 1 addition & 1 deletion FD502/wd1793.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ unsigned char SetTurboDisk( unsigned char);
//unsigned char UseKeyboardLeds(unsigned char);
DWORD GetDriverVersion ();
unsigned short InitController ();
::std::string get_mounted_disk_filename(::std::size_t drive_index);
std::string get_mounted_disk_filename(::std::size_t drive_index);

// FIXME: Needs a name and should be scoped
enum
Expand Down
2 changes: 1 addition & 1 deletion GMC/gmc_cartridge.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class gmc_cartridge : public ::vcc::bus::cartridge
public:

using context_type = ::vcc::bus::cartridge_context;
using path_type = ::std::string;
using path_type = std::string;
using rom_image_type = ::vcc::devices::rom::banked_rom_image;


Expand Down
2 changes: 1 addition & 1 deletion Ramdisk/ramdisk_cartridge.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ramdisk_cartridge : public ::vcc::bus::cartridge
{
public:

using address_type = ::std::size_t;
using address_type = std::size_t;


public:
Expand Down
8 changes: 4 additions & 4 deletions Vcc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -641,11 +641,11 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
maxHorizontalPosition -= (displayDetails.leftBorderColumns + displayDetails.rightBorderColumns);
maxVerticalPosition -= (displayDetails.topBorderRows + displayDetails.bottomBorderRows);

mouseXPosition = ::std::min(
::std::max(0, mouseXPosition - displayDetails.leftBorderColumns),
mouseXPosition = std::min(
std::max(0, mouseXPosition - displayDetails.leftBorderColumns),
maxHorizontalPosition);
mouseYPosition = ::std::min(
::std::max(0, mouseYPosition - displayDetails.topBorderRows),
mouseYPosition = std::min(
std::max(0, mouseYPosition - displayDetails.topBorderRows),
maxVerticalPosition);

#if USE_DEBUG_MOUSE
Expand Down
2 changes: 1 addition & 1 deletion acia/acia.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ __declspec(dllexport) void PakReset()
// Dll export pak rom read
//-----------------------------------------------------------------------
extern "C"
__declspec(dllexport) unsigned char PakReadMemoryByte(::std::size_t Address)
__declspec(dllexport) unsigned char PakReadMemoryByte(std::size_t Address)
{
return(Rom[Address & 8191]);
}
Expand Down
2 changes: 1 addition & 1 deletion becker/configuration_dialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class cartridge_controller
{
public:

using string_type = ::std::string;
using string_type = std::string;


public:
Expand Down
2 changes: 1 addition & 1 deletion config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ void UpdateSoundBar(const unsigned int * audioBuf,unsigned int bufLen)
int lMax = lval;
int rMin = rval;
int rMax = rval;
for (size_t i = 1; i < ::std::min(bufLen,100u); ++i) {
for (size_t i = 1; i < std::min(bufLen,100u); ++i) {
int lval = audioBuf[i] >> 16;
int rval = audioBuf[i] & 0xFFFF;
if (lval > lMax) lMax = lval;
Expand Down
8 changes: 4 additions & 4 deletions libcommon/include/vcc/bus/cartridge.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ namespace vcc::bus
public:

/// @brief Specifies the type used to store names.
using name_type = ::std::string;
using name_type = std::string;
/// @brief Specifies the type used to store catalog identifiers.
using catalog_id_type = ::std::string;
using catalog_id_type = std::string;
/// @brief Specifies the type used to store cartridge descriptions.
using description_type = ::std::string;
using description_type = std::string;
/// @brief Specifies the type used to store a size of length.
using size_type = ::std::size_t;
using size_type = std::size_t;


public:
Expand Down
2 changes: 1 addition & 1 deletion libcommon/include/vcc/bus/cartridge_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace vcc::bus
public:

/// @brief The type used to represent paths.
using path_type = ::std::string;
using path_type = std::string;
/// @brief The type used to represent menu items.
using menu_item_type = MenuItemType;

Expand Down
2 changes: 1 addition & 1 deletion libcommon/include/vcc/utils/cartridge_loader.h
Original file line number Diff line number Diff line change
Expand Up @@ -149,5 +149,5 @@ namespace vcc::utils
/// @param status The status to retrieve the description for.
///
/// @return A string containing a description of the error.
LIBCOMMON_EXPORT ::std::string load_error_string(cartridge_loader_status status);
LIBCOMMON_EXPORT std::string load_error_string(cartridge_loader_status status);
}
6 changes: 3 additions & 3 deletions libcommon/include/vcc/utils/persistent_value_store.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ namespace vcc::utils
public:

/// @brief The type used to represent paths.
using path_type = ::std::string;
using path_type = std::string;
/// @brief The type used to represent strings.
using string_type = ::std::string;
using string_type = std::string;
/// @brief The type used to represent a size or length.
using size_type = ::std::size_t;
using size_type = std::size_t;


public:
Expand Down
6 changes: 3 additions & 3 deletions libcommon/src/bus/cartridges/rom_cartridge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ namespace vcc::bus::cartridges
{
if (context_ == nullptr)
{
throw ::std::invalid_argument("Cannot construct ROM Cartridge. The cartridge context is null.");
throw std::invalid_argument("Cannot construct ROM Cartridge. The cartridge context is null.");
}

if (name.empty())
{
throw ::std::invalid_argument("Cannot construct ROM Cartridge. The catalog name is empty.");
throw std::invalid_argument("Cannot construct ROM Cartridge. The catalog name is empty.");
}

if (buffer.empty())
{
throw ::std::invalid_argument("Cannot construct ROM Cartridge. The ROM buffer is empty.");
throw std::invalid_argument("Cannot construct ROM Cartridge. The ROM buffer is empty.");
}
}

Expand Down
2 changes: 1 addition & 1 deletion libcommon/src/utils/cartridge_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ namespace vcc::utils
}
}

::std::string load_error_string(cartridge_loader_status status)
std::string load_error_string(cartridge_loader_status status)
{
static const std::map<cartridge_loader_status, UINT> string_id_map = {
{ cartridge_loader_status::already_loaded, IDS_ERROR_CARTRIDGE_ALREADY_LOADED},
Expand Down
8 changes: 4 additions & 4 deletions mpi/cartridge_slot.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ namespace vcc::modules::mpi

using context_type = ::vcc::bus::cartridge_context;
using cartridge_type = ::vcc::bus::cartridge;
using cartridge_ptr_type = ::std::unique_ptr<cartridge_type>;
using cartridge_ptr_type = std::unique_ptr<cartridge_type>;
using name_type = cartridge_type::name_type;
using catalog_id_type = cartridge_type::catalog_id_type;
using description_type = cartridge_type::description_type;
using path_type = ::std::string;
using label_type = ::std::string;
using path_type = std::string;
using label_type = std::string;
using handle_type = ::vcc::utils::cartridge_loader_result::handle_type;
using menu_item_type = CartMenuItem;
using menu_item_collection_type = std::vector<menu_item_type>;
using size_type = ::std::size_t;
using size_type = std::size_t;


public:
Expand Down
4 changes: 2 additions & 2 deletions mpi/configuration_dialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class multipak_controller
using mount_status_type = ::vcc::utils::cartridge_loader_status;
using slot_id_type = ::multipak_configuration::slot_id_type;
using path_type = ::multipak_configuration::path_type;
using label_type = ::std::string;
using description_type = ::std::string;
using label_type = std::string;
using description_type = std::string;


public:
Expand Down
8 changes: 4 additions & 4 deletions mpi/multipak_cartridge.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ class multipak_cartridge

using context_type = ::vcc::bus::cartridge_context;
using mount_status_type = ::vcc::utils::cartridge_loader_status;
using slot_id_type = ::std::size_t;
using path_type = ::std::string;
using label_type = ::std::string;
using description_type = ::std::string;
using slot_id_type = std::size_t;
using path_type = std::string;
using label_type = std::string;
using description_type = std::string;
using menu_item_type = CartMenuItem;


Expand Down
2 changes: 1 addition & 1 deletion mpi/multipak_configuration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ multipak_configuration::path_type multipak_configuration::slot_cartridge_path(sl

multipak_configuration::string_type multipak_configuration::get_slot_path_key(slot_id_type slot) const
{
return "SLOT" + ::std::to_string(slot + 1);
return "SLOT" + std::to_string(slot + 1);
}
6 changes: 3 additions & 3 deletions mpi/multipak_configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ class multipak_configuration
{
public:

using slot_id_type = ::std::size_t;
using path_type = ::std::string;
using string_type = ::std::string;
using slot_id_type = std::size_t;
using path_type = std::string;
using string_type = std::string;


public:
Expand Down