Skip to content

Commit 870bbf4

Browse files
committed
[net] remove ROOT::Deprecated::TSSLSocket
1 parent 784e392 commit 870bbf4

5 files changed

Lines changed: 2 additions & 427 deletions

File tree

README/ReleaseNotes/v642/index.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ The following people have contributed to this new version:
4444
* The **RooStats::HybridPlot** class and the related **HybridResult::GetPlot** method were deprecated in ROOT 6.40 and are now removed.
4545
* The `builtin_zeromq` and `builtin_cppzmq` build options that were deprecated in ROOT 6.40 are now removed.
4646
* The ROOT **auth** package together with `TVirtualAuth` and `TROOT::GetListOfSecContexts()`, and the **authenticated sockets** (`TSocket::CreateAuthSocket()`) feature are now removed following deprecation in ROOT 6.40.
47+
* The `TSSLSocket` class is now removed following deprecation in ROOT 6.40.
4748

4849
## Python Interface
4950

@@ -76,5 +77,3 @@ If the vectorized backend does not work for a given use case, **please report it
7677
## Documentation and Examples
7778

7879
## Build, Configuration and Testing
79-
80-

net/net/CMakeLists.txt

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,6 @@
88
# CMakeLists.txt file for building ROOT net/net package
99
############################################################################
1010

11-
if(ssl)
12-
add_definitions(-DR__SSL)
13-
14-
set(NET_SSL_HEADERS
15-
TSSLSocket.h
16-
)
17-
18-
set(NET_SSL_SOURCES
19-
src/TSSLSocket.cxx
20-
)
21-
22-
if(MACOSX_SSL_DEPRECATED)
23-
set_source_files_properties(src/TSSLSocket.cxx
24-
COMPILE_FLAGS -Wno-deprecated-declarations)
25-
endif()
26-
endif()
27-
2811
ROOT_STANDARD_LIBRARY_PACKAGE(Net
2912
HEADERS
3013
NetErrors.h
@@ -47,7 +30,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Net
4730
TSQLStatement.h
4831
TSQLTableInfo.h
4932
TUDPSocket.h
50-
${NET_SSL_HEADERS}
5133
SOURCES
5234
src/NetErrors.cxx
5335
src/TApplicationRemote.cxx
@@ -68,18 +50,11 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Net
6850
src/TSQLStatement.cxx
6951
src/TSQLTableInfo.cxx
7052
src/TUDPSocket.cxx
71-
${NET_SSL_SOURCES}
7253
DICTIONARY_OPTIONS
7354
-writeEmptyRootPCM
7455
DEPENDENCIES
7556
RIO
7657
LIBRARIES
7758
${ROOT_ATOMIC_LIBS}
7859
)
79-
80-
if(ssl)
81-
target_include_directories(Net PRIVATE ${OPENSSL_INCLUDE_DIR})
82-
target_link_libraries(Net PRIVATE ${OPENSSL_LIBRARIES})
83-
endif()
84-
85-
ROOT_ADD_TEST_SUBDIRECTORY(test)
60+
ROOT_ADD_TEST_SUBDIRECTORY(test)

net/net/inc/LinkDef.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,4 @@
3333
#pragma link C++ class TUDPSocket;
3434
#pragma link C++ class TParallelMergingFile+;
3535

36-
#ifdef R__SSL
37-
#pragma link C++ class ROOT::Deprecated::TSSLSocket;
38-
#endif
39-
4036
#endif

net/net/inc/TSSLSocket.h

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)