X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fwindows%2Fserial.cpp;h=d041c8705ba3305105f7e806cbcdce98a1e20493;hb=HEAD;hp=84a3175f875c4b0b774f1b5e1c1004db1d6bd351;hpb=7a493cb73ff5f5f820d4873d6c993d0e9c5a580a;p=libs%2Fcore.git diff --git a/source/io/windows/serial.cpp b/source/io/windows/serial.cpp index 84a3175..d041c87 100644 --- a/source/io/windows/serial.cpp +++ b/source/io/windows/serial.cpp @@ -13,7 +13,7 @@ void Serial::platform_init(const string &port) { string name = "\\\\.\\"+port; - *handle = CreateFile(name.c_str(), GENERIC_READ|GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL|FILE_FLAG_OVERLAPPED, 0); + *handle = CreateFile(name.c_str(), GENERIC_READ|GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL|FILE_FLAG_OVERLAPPED, nullptr); if(!handle) throw system_error(format("CreateFile(%s)", port)); mode = M_READ|M_WRITE; @@ -56,7 +56,7 @@ void Serial::DeviceState::set_parity(Serial::Parity par) case Serial::NONE: state.Parity = NOPARITY; break; case Serial::EVEN: state.Parity = EVENPARITY; break; case Serial::ODD: state.Parity = ODDPARITY; break; - default: throw invalid_argument("set_parity"); + default: throw invalid_argument("Serial::set_parity"); } } @@ -66,7 +66,7 @@ void Serial::DeviceState::set_stop_bits(unsigned bits) { case 1: state.StopBits = ONESTOPBIT; break; case 2: state.StopBits = TWOSTOPBITS; break; - default: throw invalid_argument("set_stop_bits"); + default: throw invalid_argument("Serial::set_stop_bits"); } }