[#1661] Renamed samples

diff --git a/src/lib/asiolink/testutils/Makefile.am b/src/lib/asiolink/testutils/Makefile.am
index 33eaf9709daaae796dada584966a0c4d0f664d22..075e7211c853ae2c1e3cbd6a14bcb701730111ca 100644 (file)
--- a/src/lib/asiolink/testutils/Makefile.am
+++ b/src/lib/asiolink/testutils/Makefile.am
@@ -61,6 +61,7 @@ if HAVE_OPENSSL
 
 noinst_PROGRAMS = openssl_sample_client openssl_sample_server
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 openssl_sample_client_SOURCES = openssl_sample_client.cc
@@ -85,11 +86,14 @@ openssl_sample_server_LDADD = $(BOOST_LIBS) $(CRYPTO_LIBS)
 >>>>>>> [#1661] Fixed build on last Fedora
 =======
 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 = $(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