소스 검색

* Fixed gcc compiler errors

master
bergmann 7 년 전
부모
커밋
07378fe9c0
4개의 변경된 파일14개의 추가작업 그리고 8개의 파일을 삭제
  1. +6
    -4
      include/cppamqp/channel.h
  2. +3
    -1
      include/cppamqp/consume_result.h
  3. +3
    -1
      include/cppamqp/publish_options.h
  4. +2
    -2
      test/CMakeLists.txt

+ 6
- 4
include/cppamqp/channel.h 파일 보기

@@ -13,12 +13,14 @@ namespace cppamqp
struct channel
{
private:
using connection_t = ::cppamqp::connection;

struct internal
{
const connection& connection;
const connection_t& connection;
channel_number handle;

internal(const ::cppamqp::connection& p_connection, channel_number p_handle);
internal(const connection_t& p_connection, channel_number p_handle);
~internal();
};

@@ -27,7 +29,7 @@ namespace cppamqp

std::shared_ptr<internal> _internal;

inline channel(const connection& p_connection, channel_number p_handle);
inline channel(const connection_t& p_connection, channel_number p_handle);

public:
inline channel();
@@ -38,7 +40,7 @@ namespace cppamqp
inline void operator = (channel&& other);

inline channel_number handle () const;
inline const connection& connection () const;
inline const connection_t& connection () const;

queue_declaration declare_queue (const std::string& name, const queue_flags& flags);
void bind_queue (const std::string& queue, const std::string& exchange, const std::string& routing_key);


+ 3
- 1
include/cppamqp/consume_result.h 파일 보기

@@ -13,11 +13,13 @@ namespace cppamqp
struct consume_result
{
private:
using message_t = ::cppamqp::message;

const connection& _connection;

public:
consume_result_type type;
message message;
message_t message;
channel_number channel;
std::string consumer_tag;
uint64_t delivery_tag;


+ 3
- 1
include/cppamqp/publish_options.h 파일 보기

@@ -10,12 +10,14 @@ namespace cppamqp
struct publish_options
{
private:
using delivery_mode_t = ::cppamqp::delivery_mode;

mutable amqp_basic_properties_t _properties;

public:
utl::nullable<std::string> content_type;
utl::nullable<std::string> content_encoding;
utl::nullable<delivery_mode> delivery_mode;
utl::nullable<delivery_mode_t> delivery_mode;
utl::nullable<uint8_t> priority;
utl::nullable<std::string> correlation_id;
utl::nullable<std::string> reply_to;


+ 2
- 2
test/CMakeLists.txt 파일 보기

@@ -17,9 +17,9 @@ File ( GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_D
Add_Executable ( test_cppamqp EXCLUDE_FROM_ALL ${SOURCE_FILES} )
Target_Link_Libraries ( test_cppamqp
cppamqp
gtest
gmock
gmock_main
gmock
gtest
pthread )
If ( __COTIRE_INCLUDED )
Cotire ( test_cppamqp )


불러오는 중...
취소
저장