CMakeLists.txt

@@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.4 FATAL_ERROR)
 project(amqpcpp)
 set (VERSION_MAJOR 4)
 set (VERSION_MINOR 3)
-set (VERSION_PATCH 27)
+set (VERSION_PATCH 26)
 set (SO_VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
 
 # build options
@@ -84,36 +84,35 @@ if(AMQP-CPP_BUILD_SHARED)
     # create shared lib
     #add_library(${PROJECT_NAME} SHARED ${SRCS})
     add_library(${PROJECT_NAME} SHARED ${src_MAIN} ${src_LINUX_TCP})
-    set_target_properties(${PROJECT_NAME} PROPERTIES
+    # set shared lib version
-        # set shared lib version
+    set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${SO_VERSION})
-        SOVERSION ${SO_VERSION}
-        # export symbols for Visual Studio as a workaround
-        WINDOWS_EXPORT_ALL_SYMBOLS ON
-    )
 else()
     # create static lib
     #add_library(${PROJECT_NAME} STATIC ${SRCS})
     add_library(${PROJECT_NAME} STATIC ${src_MAIN} ${src_LINUX_TCP})
 endif()
 
-if(WIN32)
-    target_link_libraries(${PROJECT_NAME} PUBLIC ws2_32)
-endif()
-
 # install rules
 # ------------------------------------------------------------------------------------------------------
 
-include(GNUInstallDirs)
+if(AMQP-CPP_BUILD_SHARED)
-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config
+    # copy shared lib and its static counter part
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            ARCHIVE DESTINATION lib
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+            LIBRARY DESTINATION lib
-)
+            RUNTIME DESTINATION lib
+    )
+else()
+    # copy static lib
+    install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config
+            ARCHIVE DESTINATION lib
+    )
+endif()
 
 # copy header files
-install(DIRECTORY include/amqpcpp/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amqpcpp
+install(DIRECTORY include/amqpcpp/ DESTINATION include/amqpcpp
         FILES_MATCHING PATTERN "*.h")
-install(FILES include/amqpcpp.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(FILES include/amqpcpp.h DESTINATION include)
 
 install(EXPORT ${PROJECT_NAME}Config DESTINATION cmake)
 export(TARGETS ${PROJECT_NAME} FILE ${PROJECT_NAME}Config.cmake)
@@ -122,7 +121,7 @@ set(DEST_DIR "${CMAKE_INSTALL_PREFIX}")
 set(PRIVATE_LIBS "-llibamqpcc")
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/amqpcpp.pc.in"
                "${CMAKE_CURRENT_BINARY_DIR}/amqpcpp.pc" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/amqpcpp.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/amqpcpp.pc" DESTINATION lib/pkgconfig)
 
 # submodule support
 # ------------------------------------------------------------------------------------------------------

Makefile

@@ -3,7 +3,7 @@ INCLUDE_DIR             = ${PREFIX}/include
 LIBRARY_DIR             = ${PREFIX}/lib
 export LIBRARY_NAME		= amqpcpp
 export SONAME			= 4.3
-export VERSION			= 4.3.27
+export VERSION			= 4.3.26
 
 all:
 		$(MAKE) VERSION=${VERSION} -C src all

README.md

@@ -10,7 +10,7 @@ The library can be used to parse incoming data from, and generate frames to, a R
 OVERVIEW
 ========
 
-** Are you upgrading from AMQP-CPP 3 to AMQP-CPP 4?** [Please read the upgrade instructions](#upgrading)
+**Are you upgrading from AMQP-CPP 3 to AMQP-CPP 4?** [Please read the upgrade instructions](#upgrading)
 
 **Note for the reader:** This readme file has a peculiar structure. We start
 explaining the pure and hard core low level interface in which you have to

include/amqpcpp/fieldproxy.h

@@ -2,7 +2,7 @@
  *  Field proxy. Returned by the table. Can be casted to the
  *  relevant native type (std::string or numeric)
  *
- *  @copyright 2014 - 2024 Copernica BV
+ *  @copyright 2014 Copernica BV
  */
 
 /**
@@ -207,22 +207,6 @@ public:
         return *this;
     }
 
-    /**
-     *  Assign a string value
-     *
-     *  @param  value
-     *  @return FieldProxy
-     */
-    FieldProxy &operator=(const std::string_view &value)
-    {
-        // in theory we should make a distinction between short and long string,
-        // but in practive only long strings are accepted
-        _source->set(_index, LongString(value));
-
-        // allow chaining
-        return *this;
-    }
-
     /**
      *  Assign a string value
      *

include/amqpcpp/libevent.h

@@ -140,22 +140,6 @@ private:
     std::map<int,std::unique_ptr<Watcher>> _watchers;
 
 
-    /**
-     *  Method that is called when the heartbeat frequency is negotiated
-     *  @param  connection      The connection that suggested a heartbeat interval
-     *  @param  interval        The suggested interval from the server
-     *  @return uint16_t        The interval to use
-     */
-    virtual uint16_t onNegotiate(TcpConnection *connection, uint16_t interval) override
-    {
-        // call base (in the highly theoretical case that the base class does something meaningful)
-        auto response = TcpHandler::onNegotiate(connection, interval);
-        
-        // because the LibEvHandler has not yet implemented timers for ensuring that we send
-        // some data every couple of seconds, we disabled timeouts
-        return 0;
-    }
-
     /**
      *  Method that is called by AMQP-CPP to register a filedescriptor for readability or writability
      *  @param  connection  The TCP connection object that is reporting

include/amqpcpp/table.h

@@ -138,7 +138,6 @@ public:
     Table &set(const std::string &name, uint64_t value) { return set(name, ULongLong(value)); }
     Table &set(const std::string &name, int64_t value) { return set(name, LongLong(value)); }
     Table &set(const std::string &name, const std::string &value) { return set(name, LongString(value)); }
-    Table &set(const std::string &name, const std::string_view &value) { return set(name, LongString(value)); }
     Table &set(const std::string &name, const char *value) { return set(name, LongString(std::string(value))); }
     Table &set(const std::string &name, std::nullptr_t) { return set(name, VoidField()); }
 

src/field.cpp

@@ -43,7 +43,6 @@ std::unique_ptr<Field> Field::decode(InBuffer &frame)
         case 'T':   return std::unique_ptr<Field>(new Timestamp(frame));
         case 'F':   return std::unique_ptr<Field>(new Table(frame));
         case 'V':   return std::unique_ptr<Field>(new VoidField(frame));
-        case 'x':   return std::unique_ptr<Field>(new LongString(frame));
         default:    return nullptr;
     }
 }

src/tagger.cpp

@@ -4,7 +4,7 @@
  *  Implementation for Tagger class.
  *  
  *  @author Michael van der Werve <michael.vanderwerve@mailerq.com>
- *  @copyright 2020 - 2024 Copernica BV
+ *  @copyright 2020 - 2023 Copernica BV
  */
 
 /**
@@ -80,15 +80,12 @@ void Tagger::onAck(uint64_t deliveryTag, bool multiple)
     // leap out if there are still messages or we shouldn't close yet
     if (!_close || unacknowledged()) return;
 
-    // we make a local copy to keep the object in scope even when 'this' is deleted
-    auto close = _close;
-
     // close the channel, and forward the callbacks to the installed handler
     // we need to be sure the the deffered object stays alive even if the callback
     // decides to remove us.
     _implementation->close()
-        .onSuccess([close]() { close->reportSuccess(); })
+        .onSuccess([this]() { auto close = _close; close->reportSuccess(); })
-        .onError([close](const char *message) { close->reportError(message); });
+        .onError([this](const char *message) { auto close = _close; close->reportError(message); });
 }
 
 /**
@@ -101,15 +98,12 @@ void Tagger::onNack(uint64_t deliveryTag, bool multiple)
     // leap out if there are still messages or we shouldn't close yet
     if (!_close || unacknowledged()) return;
 
-    // we make a local copy to keep the object in scope even when 'this' is deleted
-    auto close = _close;
-
     // close the channel, and forward the callbacks to the installed handler
     // we need to be sure the the deffered object stays alive even if the callback
     // decides to remove us.
     _implementation->close()
-        .onSuccess([close]() { close->reportSuccess(); })
+        .onSuccess([this]() { auto close = _close; close->reportSuccess(); })
-        .onError([close](const char *message) { close->reportError(message); });
+        .onError([this](const char *message) { auto close = _close; close->reportError(message); });
 }
 
 /**
@@ -188,8 +182,8 @@ Deferred &Tagger::close()
     // if this was already set to be closed, return that
     if (_close) return *_close;
 
-    // create the deferred (we make a local copy to keep the object in scope even when 'this is deleted)
+    // create the deferred
-    auto close = _close = std::make_shared<Deferred>(!_implementation->usable());
+    _close = std::make_shared<Deferred>(!_implementation->usable());
 
     // if there are open messages or there is a queue, they will still get acked and we will then forward it
     if (unacknowledged()) return *_close;
@@ -198,8 +192,8 @@ Deferred &Tagger::close()
     // we need to be sure the the deffered object stays alive even if the callback
     // decides to remove us.
     _implementation->close()
-        .onSuccess([close]() { close->reportSuccess(); })
+        .onSuccess([this]() { auto close = _close; close->reportSuccess(); })
-        .onError([close](const char *message) { close->reportError(message); });
+        .onError([this](const char *message) { auto close = _close; close->reportError(message); });
 
     // return the created deferred
     return *_close;