diff options
author | Rod Smith <rodsmith@rodsbooks.com> | 2022-04-10 09:28:08 -0400 |
---|---|---|
committer | Rod Smith <rodsmith@rodsbooks.com> | 2022-04-10 09:28:08 -0400 |
commit | edc67b66dbd09bf9a905bb5f1eddd1c19c2df294 (patch) | |
tree | 0676771891810a7e386d48e62b81470f80fe1c80 /basicmbr.h | |
parent | fd60f743628e16180daf3b1719974fa4dadf8f90 (diff) | |
download | sgdisk-edc67b66dbd09bf9a905bb5f1eddd1c19c2df294.tar.gz |
Patch set from Bin Meng to clean up some code & support building sgdisk for Windows
Diffstat (limited to 'basicmbr.h')
-rw-r--r-- | basicmbr.h | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -16,8 +16,6 @@ // Maximum number of MBR partitions #define MAX_MBR_PARTS 128 -using namespace std; - /**************************************** * * * MBRData class and related structures * @@ -57,23 +55,23 @@ protected: uint32_t numSecspTrack; // number of sectors per track, in CHS scheme DiskIO* myDisk; int canDeleteMyDisk; - string device; + std::string device; MBRValidity state; MBRPart* GetPartition(int i); // Return primary or logical partition public: BasicMBRData(void); - BasicMBRData(string deviceFilename); + BasicMBRData(std::string deviceFilename); BasicMBRData(const BasicMBRData &); ~BasicMBRData(void); BasicMBRData & operator=(const BasicMBRData & orig); // File I/O functions... - int ReadMBRData(const string & deviceFilename); + int ReadMBRData(const std::string & deviceFilename); int ReadMBRData(DiskIO * theDisk, int checkBlockSize = 1); int ReadLogicalParts(uint64_t extendedStart, int partNum); int WriteMBRData(void); int WriteMBRData(DiskIO *theDisk); - int WriteMBRData(const string & deviceFilename); + int WriteMBRData(const std::string & deviceFilename); int WriteMBRData(struct TempMBR & mbr, DiskIO *theDisk, uint64_t sector); void DiskSync(void) {myDisk->DiskSync();} void SetDisk(DiskIO *theDisk); @@ -147,7 +145,7 @@ public: uint64_t GetLength(int i); // User interaction functions.... - int DoMenu(const string& prompt = "\nMBR command (? for help): "); + int DoMenu(const std::string& prompt = "\nMBR command (? for help): "); void ShowCommands(void); }; // class BasicMBRData |