Commit 1e57d533 authored by Marshall Pierce's avatar Marshall Pierce
Browse files

update examples to use unique_ptr for connection

parent c4807aee

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ else(USE_LOCAL_KINETIC_CLIENT) 
        kinetic_cpp_client

        PREFIX "vendor"

        GIT_REPOSITORY "git@github.com:Seagate/Kinetic-C-Client.git"

        GIT_TAG "5782474cae5df043fbc57bb95dd00916500278ed"

        GIT_TAG "1b6b0ea5e93db15239818c449fba22479d172d94"

        BUILD_IN_SOURCE 1

        INSTALL_COMMAND ""

    )

src/delete_file_blocking.cc

+3 −3
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ using kinetic::NonblockingError; 
using kinetic::SimpleCallbackInterface;

using kinetic::Status;



using std::unique_ptr;



int main(int argc, char* argv[]) {

    google::InitGoogleLogging(argv[0]);
@@ -32,8 +33,8 @@ int main(int argc, char* argv[]) { 


    KineticConnectionFactory kinetic_connection_factory = kinetic::NewKineticConnectionFactory();



    kinetic::ConnectionHandle* connection;

    if(!kinetic_connection_factory.NewConnection(options, &connection).ok()) {

    unique_ptr<kinetic::ConnectionHandle> connection;

    if(!kinetic_connection_factory.NewConnection(options, connection).ok()) {

        printf("Unable to connect\n");

        return 1;

    }
@@ -70,7 +71,6 @@ int main(int argc, char* argv[]) { 


    printf("\nDone!\n");



    delete connection;

    google::protobuf::ShutdownProtobufLibrary();

    google::ShutdownGoogleLogging();

    google::ShutDownCommandLineFlags();

src/delete_file_nonblocking.cc

+3 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ using kinetic::Status; 


using std::make_shared;

using std::string;

using std::unique_ptr;



class DeleteCallback : public SimpleCallbackInterface {

public:
@@ -52,8 +53,8 @@ int main(int argc, char* argv[]) { 


    KineticConnectionFactory kinetic_connection_factory = kinetic::NewKineticConnectionFactory();



    kinetic::ConnectionHandle* connection;

    if(!kinetic_connection_factory.NewConnection(options, &connection).ok()) {

    unique_ptr<kinetic::ConnectionHandle> connection;

    if(!kinetic_connection_factory.NewConnection(options, connection).ok()) {

        printf("Unable to connect\n");

        return 1;

    }
@@ -95,7 +96,6 @@ int main(int argc, char* argv[]) { 


    printf("\nDone!\n");



    delete connection;

    google::protobuf::ShutdownProtobufLibrary();

    google::ShutdownGoogleLogging();

    google::ShutDownCommandLineFlags();

src/firmware_update.cc

+3 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ using kinetic::KineticRecord; 


using std::make_shared;

using std::string;

using std::unique_ptr;



int main(int argc, char* argv[]) {
@@ -30,8 +31,8 @@ int main(int argc, char* argv[]) { 


    kinetic::KineticConnectionFactory kinetic_connection_factory = kinetic::NewKineticConnectionFactory();



    kinetic::ConnectionHandle* connection;

    if (!kinetic_connection_factory.NewConnection(options, &connection).ok()) {

    unique_ptr<kinetic::ConnectionHandle> connection;

    if (!kinetic_connection_factory.NewConnection(options, connection).ok()) {

        printf("Unable to connect\n");

        return 1;

    }

src/ise.cc

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ using kinetic::KineticRecord; 


using std::shared_ptr;

using std::string;

using std::unique_ptr;



int main(int argc, char* argv[]) {

    if (argc != 3 && argc != 4) {
@@ -29,8 +30,8 @@ int main(int argc, char* argv[]) { 


    kinetic::KineticConnectionFactory kinetic_connection_factory = kinetic::NewKineticConnectionFactory();



    kinetic::ConnectionHandle* connection;

    if (!kinetic_connection_factory.NewConnection(options, &connection).ok()) {

    unique_ptr<kinetic::ConnectionHandle> connection;

    if (!kinetic_connection_factory.NewConnection(options, connection).ok()) {

        printf("Unable to connect\n");

        return 1;

    }