diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/ToolchainKit/Defines.h | 8 | ||||
| -rw-r--r-- | dev/ToolchainKit/Macros.h | 10 | ||||
| -rw-r--r-- | dev/ToolchainKit/NFC/AE.h | 4 | ||||
| -rw-r--r-- | dev/ToolchainKit/NFC/ErrorID.h | 14 | ||||
| -rw-r--r-- | dev/ToolchainKit/NFC/PEF.h | 8 | ||||
| -rw-r--r-- | dev/ToolchainKit/UUID.h | 2 |
6 files changed, 23 insertions, 23 deletions
diff --git a/dev/ToolchainKit/Defines.h b/dev/ToolchainKit/Defines.h index 978a5a2..7ce9c9e 100644 --- a/dev/ToolchainKit/Defines.h +++ b/dev/ToolchainKit/Defines.h @@ -69,19 +69,19 @@ #define rt_copy_memory(dst, src, len) memcpy(dst, src, len) #endif -#define TOOLCHAINKIT_COPY_DELETE(KLASS) \ +#define TOOLCHAINKIT_COPY_DELETE(KLASS) \ KLASS& operator=(const KLASS&) = delete; \ KLASS(const KLASS&) = delete; -#define TOOLCHAINKIT_COPY_DEFAULT(KLASS) \ +#define TOOLCHAINKIT_COPY_DEFAULT(KLASS) \ KLASS& operator=(const KLASS&) = default; \ KLASS(const KLASS&) = default; -#define TOOLCHAINKIT_MOVE_DELETE(KLASS) \ +#define TOOLCHAINKIT_MOVE_DELETE(KLASS) \ KLASS& operator=(KLASS&&) = delete; \ KLASS(KLASS&&) = delete; -#define TOOLCHAINKIT_MOVE_DEFAULT(KLASS) \ +#define TOOLCHAINKIT_MOVE_DEFAULT(KLASS) \ KLASS& operator=(KLASS&&) = default; \ KLASS(KLASS&&) = default; diff --git a/dev/ToolchainKit/Macros.h b/dev/ToolchainKit/Macros.h index c7ff04e..0713732 100644 --- a/dev/ToolchainKit/Macros.h +++ b/dev/ToolchainKit/Macros.h @@ -9,25 +9,25 @@ #ifndef _MACROS_HXX_ #define _MACROS_HXX_ -#define TOOLCHAINKIT_COPY_DELETE(KLASS) \ +#define TOOLCHAINKIT_COPY_DELETE(KLASS) \ KLASS& operator=(const KLASS&) = delete; \ KLASS(const KLASS&) = delete; -#define TOOLCHAINKIT_COPY_DEFAULT(KLASS) \ +#define TOOLCHAINKIT_COPY_DEFAULT(KLASS) \ KLASS& operator=(const KLASS&) = default; \ KLASS(const KLASS&) = default; -#define TOOLCHAINKIT_MOVE_DELETE(KLASS) \ +#define TOOLCHAINKIT_MOVE_DELETE(KLASS) \ KLASS& operator=(KLASS&&) = delete; \ KLASS(KLASS&&) = delete; -#define TOOLCHAINKIT_MOVE_DEFAULT(KLASS) \ +#define TOOLCHAINKIT_MOVE_DEFAULT(KLASS) \ KLASS& operator=(KLASS&&) = default; \ KLASS(KLASS&&) = default; /// @note xxxx is the error placeholder, in hexadecimal. #define TOOLCHAINKIT_ERROR_PREFIX_CXX "CXXxxxx" -#define TOOLCHAINKIT_ERROR_PREFIX_CL "CLxxxx" +#define TOOLCHAINKIT_ERROR_PREFIX_CL "CLxxxx" #define TOOLCHAINKIT_ERROR_PREFIX_ASM "ASMxxxx" #endif /* ifndef _MACROS_HXX_ */ diff --git a/dev/ToolchainKit/NFC/AE.h b/dev/ToolchainKit/NFC/AE.h index d86fabc..ebb218c 100644 --- a/dev/ToolchainKit/NFC/AE.h +++ b/dev/ToolchainKit/NFC/AE.h @@ -71,7 +71,7 @@ inline std::ofstream& operator<<(std::ofstream& fp, ToolchainKit::AEHeader& cont return fp; } -inline std::ofstream& operator<<(std::ofstream& fp, +inline std::ofstream& operator<<(std::ofstream& fp, ToolchainKit::AERecordHeader& container) { fp.write((char*)&container, sizeof(ToolchainKit::AERecordHeader)); @@ -85,7 +85,7 @@ inline std::ifstream& operator>>(std::ifstream& fp, ToolchainKit::AEHeader& cont return fp; } -inline std::ifstream& operator>>(std::ifstream& fp, +inline std::ifstream& operator>>(std::ifstream& fp, ToolchainKit::AERecordHeader& container) { fp.read((char*)&container, sizeof(ToolchainKit::AERecordHeader)); diff --git a/dev/ToolchainKit/NFC/ErrorID.h b/dev/ToolchainKit/NFC/ErrorID.h index 52a0e83..df67fc3 100644 --- a/dev/ToolchainKit/NFC/ErrorID.h +++ b/dev/ToolchainKit/NFC/ErrorID.h @@ -12,11 +12,11 @@ #include <ToolchainKit/Defines.h> #include <ToolchainKit/NFC/ErrorOr.h> -#define TOOLCHAINKIT_EXEC_ERROR -30 +#define TOOLCHAINKIT_EXEC_ERROR -30 #define TOOLCHAINKIT_FILE_NOT_FOUND -31 -#define TOOLCHAINKIT_DIR_NOT_FOUND -32 -#define TOOLCHAINKIT_FILE_EXISTS -33 -#define TOOLCHAINKIT_TOO_LONG -34 -#define TOOLCHAINKIT_INVALID_DATA -35 -#define TOOLCHAINKIT_UNIMPLEMENTED -36 -#define TOOLCHAINKIT_FAT_ERROR -37 +#define TOOLCHAINKIT_DIR_NOT_FOUND -32 +#define TOOLCHAINKIT_FILE_EXISTS -33 +#define TOOLCHAINKIT_TOO_LONG -34 +#define TOOLCHAINKIT_INVALID_DATA -35 +#define TOOLCHAINKIT_UNIMPLEMENTED -36 +#define TOOLCHAINKIT_FAT_ERROR -37 diff --git a/dev/ToolchainKit/NFC/PEF.h b/dev/ToolchainKit/NFC/PEF.h index b6c8bca..2e8fc68 100644 --- a/dev/ToolchainKit/NFC/PEF.h +++ b/dev/ToolchainKit/NFC/PEF.h @@ -114,28 +114,28 @@ namespace ToolchainKit }; } // namespace ToolchainKit -inline std::ofstream& operator<<(std::ofstream& fp, +inline std::ofstream& operator<<(std::ofstream& fp, ToolchainKit::PEFContainer& container) { fp.write((char*)&container, sizeof(ToolchainKit::PEFContainer)); return fp; } -inline std::ofstream& operator<<(std::ofstream& fp, +inline std::ofstream& operator<<(std::ofstream& fp, ToolchainKit::PEFCommandHeader& container) { fp.write((char*)&container, sizeof(ToolchainKit::PEFCommandHeader)); return fp; } -inline std::ifstream& operator>>(std::ifstream& fp, +inline std::ifstream& operator>>(std::ifstream& fp, ToolchainKit::PEFContainer& container) { fp.read((char*)&container, sizeof(ToolchainKit::PEFContainer)); return fp; } -inline std::ifstream& operator>>(std::ifstream& fp, +inline std::ifstream& operator>>(std::ifstream& fp, ToolchainKit::PEFCommandHeader& container) { fp.read((char*)&container, sizeof(ToolchainKit::PEFCommandHeader)); diff --git a/dev/ToolchainKit/UUID.h b/dev/ToolchainKit/UUID.h index 00b153b..d785fc7 100644 --- a/dev/ToolchainKit/UUID.h +++ b/dev/ToolchainKit/UUID.h @@ -199,7 +199,7 @@ namespace uuids process_byte(static_cast<unsigned char>((bitCount >> 24) & 0xFF)); process_byte(static_cast<unsigned char>((bitCount >> 16) & 0xFF)); process_byte(static_cast<unsigned char>((bitCount >> 8) & 0xFF)); - process_byte(static_cast<unsigned char>((bitCount)&0xFF)); + process_byte(static_cast<unsigned char>((bitCount) & 0xFF)); memcpy(digest, m_digest, 5 * sizeof(uint32_t)); return digest; |