Commit 97984aa5 authored by Steven Murray's avatar Steven Murray
Browse files

Fixed a few more cc7 compilation errors

parent 3e679707
......@@ -16,14 +16,17 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <exception>
#include "objectstore/BackendFactory.hpp"
#include "objectstore/BackendVFS.hpp"
#include "tapeserver/castor/common/CastorConfiguration.hpp"
#include "tapeserver/castor/log/DummyLogger.hpp"
#include "scheduler/OStoreDB/OStoreDB.hpp"
#include "common/SecurityIdentity.hpp"
#include <exception>
#include <iostream>
#include <unistd.h>
#include <sys/types.h>
int main(int argc, char ** argv) {
try{
......@@ -50,4 +53,4 @@ int main(int argc, char ** argv) {
} catch (std::exception & e) {
std::cerr << "In ctaAddAdminUser: got an exception: " << e.what() << std::endl;
}
}
\ No newline at end of file
}
......@@ -1411,7 +1411,7 @@ auto OStoreDB::ArchiveMount::getNextJob() -> std::unique_ptr<SchedulerDatabase::
privateRet->m_tapePool = mountInfo.tapePool;
return std::unique_ptr<SchedulerDatabase::ArchiveJob> (privateRet.release());
}
return std::unique_ptr<SchedulerDatabase::ArchiveJob> (NULL);
return std::unique_ptr<SchedulerDatabase::ArchiveJob>();
}
void OStoreDB::ArchiveMount::complete(time_t completionTime) {
......@@ -1536,7 +1536,7 @@ auto OStoreDB::RetrieveMount::getNextJob() -> std::unique_ptr<SchedulerDatabase:
privateRet->m_jobOwned = true;
return std::unique_ptr<SchedulerDatabase::RetrieveJob> (privateRet.release());
}
return std::unique_ptr<SchedulerDatabase::RetrieveJob> (NULL);
return std::unique_ptr<SchedulerDatabase::RetrieveJob>();
}
void OStoreDB::RetrieveMount::complete(time_t completionTime) {
......
......@@ -582,7 +582,7 @@ void cta::Scheduler::modifyDedicationComment(const cta::common::dataStructures::
//------------------------------------------------------------------------------
// repack
//------------------------------------------------------------------------------
void cta::Scheduler::repack(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const std::string &tag, const RepackType) {
void cta::Scheduler::repack(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const std::string &tag, const cta::common::dataStructures::RepackType) {
}
......@@ -617,7 +617,7 @@ void cta::Scheduler::shrink(const cta::common::dataStructures::SecurityIdentity
//------------------------------------------------------------------------------
// verify
//------------------------------------------------------------------------------
void cta::Scheduler::verify(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const std::string &tag, const VerifyType) {
void cta::Scheduler::verify(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const std::string &tag, const cta::common::dataStructures::VerifyType) {
}
......
......@@ -187,14 +187,14 @@ public:
virtual void modifyDedicationUntil(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &drivename, const uint64_t untilTimestamp);
virtual void modifyDedicationComment(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &drivename, const std::string &comment);
virtual void repack(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const std::string &tag, const RepackType);
virtual void repack(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const std::string &tag, const cta::common::dataStructures::RepackType);
virtual void cancelRepack(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid);
virtual std::list<cta::common::dataStructures::RepackInfo> getRepacks(const cta::common::dataStructures::SecurityIdentity &requester);
virtual cta::common::dataStructures::RepackInfo getRepack(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid);
virtual void shrink(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &tapepool); // removes extra tape copies from a specific pool(usually an "_2" pool)
virtual void verify(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const std::string &tag, const VerifyType);
virtual void verify(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid, const std::string &tag, const cta::common::dataStructures::VerifyType);
virtual void cancelVerify(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid);
virtual std::list<cta::common::dataStructures::VerifyInfo> getVerifys(const cta::common::dataStructures::SecurityIdentity &requester) const;
virtual cta::common::dataStructures::VerifyInfo getVerify(const cta::common::dataStructures::SecurityIdentity &requester, const std::string &vid) const;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment