From: derek Date: Wed, 12 Jan 2011 03:43:51 +0000 (-0500) Subject: Removed explicit keyword from SamHeader-related object copy ctors X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7e2b34b53dd34422b3f2308bda4bbe7ab3ee129d;p=bamtools.git Removed explicit keyword from SamHeader-related object copy ctors --- diff --git a/src/api/SamHeader.h b/src/api/SamHeader.h index add4418..899459c 100644 --- a/src/api/SamHeader.h +++ b/src/api/SamHeader.h @@ -23,8 +23,8 @@ struct API_EXPORT SamHeader { // ctor & dtor public: - explicit SamHeader(const std::string& headerText = ""); - explicit SamHeader(const SamHeader& other); + SamHeader(const std::string& headerText = ""); + SamHeader(const SamHeader& other); ~SamHeader(void); // query/modify entire SamHeader at once diff --git a/src/api/SamReadGroup.h b/src/api/SamReadGroup.h index 14498af..c53274a 100644 --- a/src/api/SamReadGroup.h +++ b/src/api/SamReadGroup.h @@ -22,7 +22,7 @@ class API_EXPORT SamReadGroup { public: SamReadGroup(void); SamReadGroup(const std::string& id); - explicit SamReadGroup(const SamReadGroup& other); + SamReadGroup(const SamReadGroup& other); ~SamReadGroup(void); // public methods diff --git a/src/api/SamReadGroupDictionary.h b/src/api/SamReadGroupDictionary.h index 5179b26..8a2bb5b 100644 --- a/src/api/SamReadGroupDictionary.h +++ b/src/api/SamReadGroupDictionary.h @@ -29,7 +29,7 @@ class API_EXPORT SamReadGroupDictionary { // ctor & dtor public: SamReadGroupDictionary(void); - explicit SamReadGroupDictionary(const SamReadGroupDictionary& other); + SamReadGroupDictionary(const SamReadGroupDictionary& other); ~SamReadGroupDictionary(void); // query/modify read group data diff --git a/src/api/SamSequence.h b/src/api/SamSequence.h index 97cdb96..4dedcaa 100644 --- a/src/api/SamSequence.h +++ b/src/api/SamSequence.h @@ -21,7 +21,7 @@ class API_EXPORT SamSequence { // ctor & dtor public: SamSequence(const std::string& name = ""); - explicit SamSequence(const SamSequence& other); + SamSequence(const SamSequence& other); ~SamSequence(void); // public methods diff --git a/src/api/SamSequenceDictionary.h b/src/api/SamSequenceDictionary.h index 37ac824..ce80756 100644 --- a/src/api/SamSequenceDictionary.h +++ b/src/api/SamSequenceDictionary.h @@ -27,7 +27,7 @@ class API_EXPORT SamSequenceDictionary { // ctor & dtor public: SamSequenceDictionary(void); - explicit SamSequenceDictionary(const SamSequenceDictionary& other); + SamSequenceDictionary(const SamSequenceDictionary& other); ~SamSequenceDictionary(void); // query/modify sequence data diff --git a/src/api/internal/BamReader_p.cpp b/src/api/internal/BamReader_p.cpp index 7aa18f3..e0a3d90 100644 --- a/src/api/internal/BamReader_p.cpp +++ b/src/api/internal/BamReader_p.cpp @@ -137,7 +137,7 @@ const string BamReaderPrivate::GetHeaderText(void) const { return m_header->ToString(); } -SamHeader BamReaderPrivate::GetSamHeader(void) const { +const SamHeader BamReaderPrivate::GetSamHeader(void) const { return m_header->ToSamHeader(); } diff --git a/src/api/internal/BamReader_p.h b/src/api/internal/BamReader_p.h index 79bcddb..3d49a63 100644 --- a/src/api/internal/BamReader_p.h +++ b/src/api/internal/BamReader_p.h @@ -67,7 +67,7 @@ class BamReaderPrivate { // access auxiliary data const std::string GetHeaderText(void) const; - SamHeader GetSamHeader(void) const; + const SamHeader GetSamHeader(void) const; int GetReferenceID(const std::string& refName) const; // index operations diff --git a/src/api/internal/BamWriter_p.h b/src/api/internal/BamWriter_p.h index 6eecd73..d931405 100644 --- a/src/api/internal/BamWriter_p.h +++ b/src/api/internal/BamWriter_p.h @@ -46,10 +46,6 @@ class BamWriterPrivate { const std::string& samHeader, const BamTools::RefVector& referenceSequences, bool isWriteUncompressed); - bool Open(const std::string& filename, - const std::string& samHeader, - const BamTools::RefVector& referenceSequences, - bool isWriteUncompressed); void SaveAlignment(const BamAlignment& al); // internal methods