[#1661] Renamed samples

diff --git a/src/lib/asiolink/testutils/Makefile.am b/src/lib/asiolink/testutils/Makefile.am
index 0895b80a953cca14436a44ecedc4dc82a3effa66..7fc9d491f98e62fc3352ba55f6a8d9525427bb87 100644 (file)
--- a/src/lib/asiolink/testutils/Makefile.am
+++ b/src/lib/asiolink/testutils/Makefile.am
@@ -65,7 +65,11 @@ noinst_PROGRAMS = openssl_sample_client openssl_sample_server
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 openssl_sample_client_SOURCES = openssl_sample_client.cc
+=======
+openssl_sample_client_SOURCES = openssl_sample_client.cpp
+>>>>>>> [#1661] Renamed samples
 openssl_sample_client_CPPFLAGS = $(AM_CPPFLAGS)
 openssl_sample_client_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 openssl_sample_client_LDADD = $(BOOST_LIBS) $(CRYPTO_LIBS)
@@ -97,7 +101,7 @@ openssl_sample_client_CPPFLAGS = $(AM_CPPFLAGS)
 openssl_sample_client_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 openssl_sample_client_LDADD = $(CRYPTO_LIBS)
 
-openssl_sample_server_SOURCES = openssl_sample_server.cc
+openssl_sample_server_SOURCES = openssl_sample_server.cpp
 openssl_sample_server_CPPFLAGS = $(AM_CPPFLAGS)
 openssl_sample_server_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 openssl_sample_server_LDADD = $(CRYPTO_LIBS)

diff --git a/src/lib/asiolink/testutils/openssl_sample_client.cc b/src/lib/asiolink/testutils/openssl_sample_client.cpp
similarity index 100%
rename from src/lib/asiolink/testutils/openssl_sample_client.cc
rename to src/lib/asiolink/testutils/openssl_sample_client.cpp

diff --git a/src/lib/asiolink/testutils/openssl_sample_server.cc b/src/lib/asiolink/testutils/openssl_sample_server.cpp
similarity index 100%
rename from src/lib/asiolink/testutils/openssl_sample_server.cc
rename to src/lib/asiolink/testutils/openssl_sample_server.cpp