Various minor fixes.

Fixed missing unsigned type on literal for SLC5.
Removed leftoved from merge
Removed unused class with Clang errors

castor/tape/tapeserver/SCSI/Device.hpp

@@ -131,13 +131,6 @@ namespace SCSI {
 
   }; /* class DeviceVector */
 
-  class Device {
-  public:
-    Device(int fd): m_fd(fd) {};
-    
-  private:
-    int m_fd;
-  }; // class Device
 } // namespace SCSI
 } // namespace tape
 } // namespace castor

castor/tape/tapeserver/SCSI/DeviceTest.cpp

@@ -138,8 +138,8 @@ TEST(castor_tape_SCSI_DeviceList, FindBySymlink) {
       castor::tape::SCSI::DeviceVector::NotFound);
   castor::tape::SCSI::DeviceInfo & di = dl.findBySymlink("/dev/tape_T10D6116");
   // The symlink is supposed to point to nst0 which is 9,128 (maj,min)
-  ASSERT_EQ(9, di.nst.major);
-  ASSERT_EQ(128, di.nst.minor);
+  ASSERT_EQ(9U, di.nst.major);
+  ASSERT_EQ(128U, di.nst.minor);
   // We expect to get a module type of "VIRTUAL" here. This will be used
   // in other tests
   ASSERT_EQ("VIRTUAL", di.product);

castor/tape/tapeserver/daemon/ClientProxy.cpp

@@ -164,7 +164,7 @@ throw (castor::tape::Exception) {
   // We could use the castor typing here, but we stick to case for homogeneity
   // of the code.
   try {
-    dynamic_cast<tapegateway::NotificationAcknowledge &>(*ack.get());
+    (void)dynamic_cast<tapegateway::NotificationAcknowledge &>(*ack.get());
   } catch (std::bad_cast) {
     throw UnexpectedResponse(ack.get(), 
         "Unexpected response when reporting end of session");
@@ -189,7 +189,7 @@ throw (castor::tape::Exception) {
   // We could use the castor typing here, but we stick to case for homogeneity
   // of the code.
   try {
-    dynamic_cast<tapegateway::NotificationAcknowledge &>(*ack.get());
+    (void)dynamic_cast<tapegateway::NotificationAcknowledge &>(*ack.get());
   } catch (std::bad_cast) {
     throw UnexpectedResponse(ack.get(), 
         "Unexpected response when reporting end of session");

test/CMakeLists.txt

@@ -153,13 +153,7 @@ add_executable(castorThreadedUnitTests
   ../castor/tape/tapeserver/daemon/tapeserverdTest.cpp
   ../castor/tape/tapeserver/threading/ThreadingBlockingQTests.cpp
 )
-#<<<<<<< HEAD
-#target_link_libraries(castorThreadedUnitTests TapeDrive Exception System 
-#  File castorTapeServerThreading tapeserverdTest tapeserver SCSI Utils
-#  castortapegatewayprotocol castortapeutils
-#  ${GTEST_LIBRARY} gmock pthread castorcommon castorclient castorvdqm
-#  castorvmgr castorrfio)
-#=======
+
 target_link_libraries(castorThreadedUnitTests
   Exception
   File