diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:53:34 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:55:14 -0400 |
| commit | e0c122119afea4c951c0c57144d26a473118c254 (patch) | |
| tree | 34a02a56f9b017201dfb721ef678c711351466d6 /lib/raidfile/RaidFileController.cpp | |
| parent | e0eb815b67734abd09ff41e2271630d4b2a6d760 (diff) | |
Fixup botched merge
Diffstat (limited to 'lib/raidfile/RaidFileController.cpp')
| -rw-r--r-- | lib/raidfile/RaidFileController.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/raidfile/RaidFileController.cpp b/lib/raidfile/RaidFileController.cpp index 84c2a520..cf93947f 100644 --- a/lib/raidfile/RaidFileController.cpp +++ b/lib/raidfile/RaidFileController.cpp @@ -164,26 +164,18 @@ RaidFileDiscSet &RaidFileController::GetDiscSet(unsigned int DiscSetNum) { if(DiscSetNum < 0 || DiscSetNum >= mSetList.size()) { -<<<<<<< HEAD - THROW_EXCEPTION(RaidFileException, NoSuchDiscSet) -======= THROW_EXCEPTION_MESSAGE(RaidFileException, NoSuchDiscSet, DiscSetNum << " (" << mSetList.size() << " disc sets configured)") ->>>>>>> 0.12 } return mSetList[DiscSetNum]; } -<<<<<<< HEAD - -======= // Overload to make usable in gdb debugger. int RaidFileDiscSet::GetSetNumForWriteFiles(const char* filename) const { return GetSetNumForWriteFiles(std::string(filename)); } ->>>>>>> 0.12 // -------------------------------------------------------------------------- // |