#547 Fixed up some of the v5 examples for proper connect options

Signed-off-by: Laurenz Altenmüller <git@laure.nz>

examples/async_consume_v5.cpp

@@ -43,7 +43,6 @@ using namespace std;
 const string DFLT_SERVER_URI{"mqtt://localhost:1883"};
 const string CLIENT_ID{"PahoCppAsyncConsumeV5"};
 
-// const string TOPIC{"hello"};
 const string TOPIC{"#"};
 const int QOS = 1;
 

examples/async_subscribe_v5.cpp

@@ -193,9 +193,7 @@ int main(int argc, char* argv[])
 
     mqtt::async_client cli(serverURI, CLIENT_ID);
 
-    auto connOpts = mqtt::connect_options_builder::v5()
-        .clean_start(true)
-        .finalize();
+    auto connOpts = mqtt::connect_options_builder::v5().clean_start(true).finalize();
 
     // Install the callback(s) before connecting.
     callback cb(cli, connOpts);

examples/mqttpp_chat.cpp

@@ -76,7 +76,7 @@ int main(int argc, char* argv[])
 
     // Set up the connect options
 
-    auto connOpts = mqtt::connect_options_builder()
+    auto connOpts = mqtt::connect_options_builder::v5()
                         .properties({{mqtt::property::SESSION_EXPIRY_INTERVAL, 604800}})
                         .clean_start(false)
                         .will(std::move(lwt))

examples/rpc_math_srvr.cpp

@@ -90,10 +90,9 @@ double mult(const std::vector<double>& nums)
 
 int main(int argc, char* argv[])
 {
-    mqtt::create_options createOpts(MQTTVERSION_5);
-    mqtt::client cli(SERVER_ADDRESS, CLIENT_ID, createOpts);
+    mqtt::client cli(SERVER_ADDRESS, CLIENT_ID);
 
-    auto connOpts = mqtt::connect_options_builder()
+    auto connOpts = mqtt::connect_options_builder::v5()
                         .keep_alive_interval(seconds(20))
                         .clean_start()
                         .finalize();

examples/sync_consume_v5.cpp

@@ -84,7 +84,7 @@ int main(int argc, char* argv[])
 {
     auto serverURI = (argc > 1) ? std::string{argv[1]} : DFLT_SERVER_URI;
 
-    mqtt::client cli(serverURI, CLIENT_ID, mqtt::create_options(MQTTVERSION_5));
+    mqtt::client cli(serverURI, CLIENT_ID);
 
     auto connOpts = mqtt::connect_options_builder::v5()
                         .automatic_reconnect(seconds(2), seconds(30))

src/ssl_options.cpp

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2016 Guilherme Ferreira <guilherme.maciel.ferreira@gmail.com>
- * Copyright (c) 2016-2021 Frank Pagliughi <fpagliughi@mindspring.com>
+ * Copyright (c) 2016-2025 Frank Pagliughi <fpagliughi@mindspring.com>
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0