Fix Clang compile error

CMakeCPack.cmake

@@ -16,12 +16,12 @@ SET(CPACK_PACKAGE_VERSION_MAJOR  ${LIBAWS_MAJOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_MINOR  ${LIBAWS_MINOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_PATCH  ${LIBAWS_PATCH_VERSION})
 
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.txt")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.txt")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "libaws - A Amazon Web Services C++ Library")
 SET(CPACK_PACKAGE_EXECUTABLES "s3")
 SET(CPACK_PACKAGE_NAME "libaws")
 SET(CPACK_PACKAGE_CONTACT "[email protected]")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.txt")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.txt")
 SET(CPACK_PACKAGE_VENDOR "28msec, Inc.")
 SET(CPACK_PACKAGE_VERSION "${LIBAWS_MAJOR_VERSION}.${LIBAWS_MINOR_VERSION}.${LIBAWS_PATCH_VERSION}")
 SET(CPACK_PACKAGE_FILE_NAME "libaws-${LIBAWS_MAJOR_VERSION}.${LIBAWS_MINOR_VERSION}.${LIBAWS_PATCH_VERSION}")
@@ -30,7 +30,7 @@ SET(CPACK_PACKAGE_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}")
 SET(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "libaws ${LIBAWS_MAJOR_VERSION}.${LIBAWS_MINOR_VERSION}")
 SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "libaws ${CPACK_PACKAGE_VERSION}")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt")
+SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
 
 SET(CPACK_DEBIAN_PACKAGE_NAME "libaws")
 SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libcurl3-dev, libcurl4-openssl-dev, libxml2-dev")

CMakeLists.txt

@@ -126,7 +126,7 @@ ADD_CUSTOM_TARGET(uninstall
     "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/CMakeUninstall.cmake")
 
 # configure the cmake script to create a source package
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/CPackSourceConfig.cmake.in 
+CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/CPackSourceConfig.cmake.in
                ${CMAKE_BINARY_DIR}/CPackSourceConfig.cmake)
 MESSAGE(STATUS "configured ${CMAKE_SOURCE_DIR}/CPackSourceConfig.cmake.in --> ${CMAKE_BINARY_DIR}/CPackSourceConfig.cmake")
 
@@ -135,6 +135,6 @@ INCLUDE(CMakeExportBuildSettings)
 CMAKE_EXPORT_BUILD_SETTINGS(${CMAKE_BINARY_DIR}/LIBAWSBuildSettings.cmake)
 EXPORT_LIBRARY_DEPENDENCIES(${CMAKE_BINARY_DIR}/LIBAWSDepends.cmake)
 
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/LIBAWSConfig.cmake.in ${CMAKE_BINARY_DIR}/LIBAWSConfig.cmake)
+CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/LIBAWSConfig.cmake.in ${CMAKE_BINARY_DIR}/LIBAWSConfig.cmake)
 
 INCLUDE(CMakeCPack.cmake)

bin/s3.cpp

@@ -16,6 +16,7 @@
 #include <iostream>
 #include <fstream>
 #include <stdlib.h>
+#include <unistd.h>
 #include <libaws/aws.h>
 
 using namespace aws;

bin/sdb.cpp

@@ -16,6 +16,7 @@
 #include <iostream>
 #include <fstream>
 #include <stdlib.h>
+#include <unistd.h>
 #include <libaws/aws.h>
 
 using namespace aws;

bin/sqs.cpp

@@ -16,6 +16,7 @@
 #include <iostream>
 #include <fstream>
 #include <stdlib.h>
+#include <unistd.h>
 #include <libaws/aws.h>
 
 using namespace aws;

doc/CMakeLists.txt

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake_modules/CMakeUseDoxygen.cmake)
+INCLUDE(${PROJECT_SOURCE_DIR}/cmake_modules/CMakeUseDoxygen.cmake)
 
 #install the documentation
 IF(DOXYGEN_FOUND)

fuse/s3fs.cpp

@@ -56,6 +56,7 @@
 #include <cassert>
 #include <stdio.h>
 #include <unistd.h>
+#include <stddef.h>
 
 #include <libaws/aws.h>
 #include "properties.h"

include/libaws/common.h

@@ -105,6 +105,9 @@ namespace aws {
   class DeleteMessageResponse;
   typedef SmartPtr<DeleteMessageResponse> DeleteMessageResponsePtr;
 
+  class GetQueueAttributesResponse;
+  typedef SmartPtr<GetQueueAttributesResponse> GetQueueAttributesResponsePtr;
+
   /**
    * SDB stuff
    */

include/libaws/sqsconnection.h

@@ -49,6 +49,9 @@ namespace aws {
 
       virtual DeleteMessageResponsePtr
       deleteMessage(const std::string &aQueueUrl, const std::string &aReceiptHandle) = 0;
+
+      virtual GetQueueAttributesResponsePtr
+      getQueueAttributes( const std::string &aQueueUrl ) = 0;
 
   }; /* class SQSConnection */
 

include/libaws/sqsexception.h

@@ -129,6 +129,15 @@ namespace aws {
 			CreateQueueException(const QueryErrorResponse&);
 	};
 
+    class GetQueueAttributesException : public SQSException
+    {
+        public:
+            virtual ~GetQueueAttributesException() throw();
+        private:
+            friend class sqs::SQSConnection;
+            GetQueueAttributesException(const QueryErrorResponse&);
+    };
+
 	class DeleteQueueException : public SQSException
 	{
 	public:

include/libaws/sqsresponse.h

@@ -31,6 +31,7 @@ namespace aws {
       class SendMessageResponse;
       class ReceiveMessageResponse;
       class DeleteMessageResponse;
+      class GetQueueAttributesResponse;
   } /* namespace sqs */
 
   template <class T>
@@ -109,6 +110,21 @@ namespace aws {
 
       SendMessageResponse(sqs::SendMessageResponse*);
   };
+
+  class GetQueueAttributesResponse : public SQSResponse<sqs::GetQueueAttributesResponse> 
+  {
+    public:
+      ~GetQueueAttributesResponse() {}
+      int getNumberOfMessages();
+      int getNumberOfNotVisibleMessages();
+      time_t getLastModifiedTime();
+      time_t getCreateTime();
+      int getMessageRetentionPeriod();
+
+    protected:
+      friend class SQSConnectionImpl;
+      GetQueueAttributesResponse(sqs::GetQueueAttributesResponse*);
+  };
 
   class ReceiveMessageResponse : public SQSResponse<sqs::ReceiveMessageResponse>
   {
@@ -123,6 +139,7 @@ namespace aws {
         std::string message_id;
         uint64_t    meta_data;
         std::string receipt_handle;
+        uint64_t    approximate_count;
       };
 
       void

src/api/connectionpool.cpp

@@ -25,7 +25,7 @@ namespace aws {
       theSize(size)
     {
       for(unsigned int i=1;i<=size;i++){
-         push(createConnection(theAccessKeyId, theSecretAccessKey));
+         std::queue<T>::push(createConnection(theAccessKeyId, theSecretAccessKey));
       }
     }
 

src/api/sqsconnectionimpl.cpp

@@ -65,6 +65,12 @@ namespace aws {
     return new DeleteMessageResponse(theConnection->deleteMessage(aQueueUrl, aReceiptHandle));
   }
 
+  GetQueueAttributesResponsePtr
+  SQSConnectionImpl::getQueueAttributes(const std::string& aQueueUrl)
+  {
+    return new GetQueueAttributesResponse(theConnection->getQueueAttributes(aQueueUrl));
+  }
+
   SQSConnectionImpl::SQSConnectionImpl(const std::string& aAccessKeyId,
                                        const std::string& aSecretAccessKey,
                                        const std::string& aCustomHost)

src/api/sqsconnectionimpl.h

@@ -53,6 +53,9 @@ namespace aws {
       virtual DeleteMessageResponsePtr
       deleteMessage(const std::string &aQueueUrl, const std::string &aReceiptHandle);
 
+      virtual GetQueueAttributesResponsePtr
+      getQueueAttributes( const std::string &aQueueUrl );
+
     protected:
       // only the factory can create us
       friend class AWSConnectionFactoryImpl;

src/api/sqsresponse.cpp

@@ -67,6 +67,38 @@ namespace aws {
   DeleteQueueResponse::DeleteQueueResponse(sqs::DeleteQueueResponse* r)
     : SQSResponse<sqs::DeleteQueueResponse>(r) {}
 
+  GetQueueAttributesResponse::GetQueueAttributesResponse(sqs::GetQueueAttributesResponse* r)
+    : SQSResponse<sqs::GetQueueAttributesResponse>(r) {}
+
+  int
+  GetQueueAttributesResponse::getNumberOfMessages()
+  {
+    return theSQSResponse->getNumberOfMessages();
+  }
+
+  int
+  GetQueueAttributesResponse::getNumberOfNotVisibleMessages()
+  {
+    return theSQSResponse->getNumberOfNotVisibleMessages();
+  }
+
+  time_t
+  GetQueueAttributesResponse::getLastModifiedTime()
+  {
+    return theSQSResponse->getLastModifiedTime();
+  }
+
+  time_t
+  GetQueueAttributesResponse::getCreateTime()
+  {
+    return theSQSResponse->getCreateTime();
+  }
+  int
+  GetQueueAttributesResponse::getMessageRetentionPeriod()
+  {
+    return theSQSResponse->getMessageRetentionPeriod();
+  }
+
   /**
    * ListQueuesResponse
    */

src/awsqueryconnection.cpp

@@ -153,11 +153,8 @@ namespace aws {
     // can possibly be removed with a newer curl version
     // because it will always copy
     std::string lUrlString = lUrl.str();
-
     LOG_INFO("Send request:" << lUrlString);
 
-
-
     //std::cout << lUrlString << std::endl;
     // set the request url
     curl_easy_setopt ( theCurl, CURLOPT_URL, lUrlString.c_str() );

src/s3/s3handler.cpp

@@ -432,7 +432,7 @@ ListBucketHandler::charactersSAXFunc(void * ctx,
 
 #endif
 #ifndef NDEBUG
-    assert(lEndValue=='\0');
+    assert(**lEndValue=='\0');
 #endif
   } else if (lHandler->isSet(CommonPrefixes) && lHandler->isSet(Prefix)) {
     lRes->theCommonPrefixes.push_back(std::string((const char*)value, len));

src/sqs/sqsconnection.cpp

@@ -152,7 +152,8 @@ namespace aws { namespace sqs {
         s << aVisibilityTimeout;
         lMap.insert (ParameterPair ("VisibilityTimeout", s.str()));
       }
-
+    lMap.insert (ParameterPair ("AttributeName", "All"));
+    lMap.insert (ParameterPair ("Version", "2009-02-01"));
     return receiveMessage (aQueueUrl, lMap, aDecode);
   } 
 
@@ -170,6 +171,22 @@ namespace aws { namespace sqs {
       }
   }
 
+  GetQueueAttributesResponse*
+  SQSConnection::getQueueAttributes(const std::string& aQueueUrl)
+  {
+    ParameterMap lMap;
+    lMap.insert( ParameterPair ("AttributeName.1", "All"));
+    lMap.insert( ParameterPair ("Version", "2012-11-05"));
+    GetQueueAttributesHandler lHandler;
+    makeQueryRequest(aQueueUrl, "GetQueueAttributes", &lMap, &lHandler);
+    if (lHandler.isSuccessful()) {
+      setCommons(lHandler, lHandler.theGetQueueAttributesResponse);
+      return lHandler.theGetQueueAttributesResponse;
+    } else {
+      throw GetQueueAttributesException (lHandler.getQueryErrorResponse());
+    }
+  }
+
   DeleteMessageResponse*
   SQSConnection::deleteMessage(const std::string &aQueueUrl, const std::string &aReceiptHandle)
   {

src/sqs/sqsconnection.h

@@ -33,6 +33,7 @@ namespace aws {
     class SendMessageResponse;
     class ReceiveMessageResponse;
     class DeleteMessageResponse;
+    class GetQueueAttributesResponse;
 
     class SQSConnection : public AWSQueryConnection
     {
@@ -51,6 +52,9 @@ namespace aws {
                       int aPort,
                       bool aIsSecure);
 
+        virtual GetQueueAttributesResponse*
+        getQueueAttributes( const std::string &aQueueUrl );
+
         virtual CreateQueueResponse*
         createQueue ( const std::string &aQueueName, int aDefaultVisibilityTimeout );
 

src/sqs/sqsexception.cpp

@@ -54,6 +54,11 @@ namespace aws {
 
     CreateQueueException::~CreateQueueException() throw() {}
 
+    GetQueueAttributesException::GetQueueAttributesException (const QueryErrorResponse& aError)
+        : SQSException (aError) {}
+
+    GetQueueAttributesException::~GetQueueAttributesException() throw() {}
+
     ListQueuesException::ListQueuesException (const QueryErrorResponse& aError)
         : SQSException (aError) {}