Skip to content

Commit 5f30829

Browse files
committed
Remove the usage of boost
Change-Id: I6a85491f276b784aec33d7820fca5a76174db04d
1 parent b85e4ec commit 5f30829

File tree

76 files changed

+1705
-1625
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1705
-1625
lines changed

cdk/cmake/compiler/CLANG.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
# along with this program; if not, write to the Free Software Foundation, Inc.,
2727
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2828

29-
3029
function(enable_cxx17)
3130

3231
add_flags(CXX -std=c++17)
@@ -37,7 +36,7 @@ function(enable_cxx17)
3736
# sure that clang's native implementation of C++ std
3837
# libarary (libc++) is used. Otherwise clang defaults to
3938
# GNU version (libstdc++) which is outdated and does
40-
# not handle C++11 well.
39+
# not handle C++17 well.
4140
#
4241
# TODO: Add option to use the default runtime if user wishes
4342
# so.

cdk/core/tests/session-t.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program is free software; you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License, version 2.0, as
@@ -920,7 +920,7 @@ struct Doc_list
920920

921921
uint32_t count() const { return N; }
922922

923-
boost::scoped_ptr<Doc> m_doc;
923+
std::unique_ptr<Doc> m_doc;
924924

925925
Doc& get_doc(uint32_t pos) const
926926
{

cdk/doc/usage.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ project's root folder. CDK should be included from project's main
1717

1818
ADD_SUBDIRECTORY(cdk)
1919

20-
CDK requires boost and protobuf to be built. If these libraries can not
21-
be found automatically, locations should be specified using ``WITH_BOOST``
22-
and ``WITH_PROTOBUF`` configuration options.
20+
CDK requires protobuf to be built. If protobuf can not
21+
be found automatically, locations should be specified using ``WITH_PROTOBUF``
22+
configuration option.
2323

2424
To build a library target ``foo`` which uses CDK
2525
one should declare it as follows in ``CMakeLists.txt``::
@@ -92,7 +92,7 @@ with build configuration options:
9292
(see below).
9393

9494
:WITH_CDK_DOC:
95-
Build CDK documetation using Sphinx.
95+
Build CDK documetation using Sphinx.
9696

9797
:WITH_NGS_MOCKUP:
9898
Build NGS mockup server which can be used for testing client-side code.
@@ -548,7 +548,7 @@ and one has to wait for it to complete, before connection can be used.
548548
549549
Reporting bugs
550550
==============
551-
Please report bugs in Jira project
551+
Please report bugs in Jira project
552552
`MySQLng Connector/C <https://jira.oraclecorp.com/jira/browse/MYC>`_
553553
as issues of type ``Defect`` with "Component" set to ``CDK``.
554554

cdk/extra/process_launcher/tests/unit_tests.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program is free software; you can redistribute it and/or modify
55
* it under the terms of the GNU General Public License, version 2.0, as
@@ -38,7 +38,7 @@
3838
#include <cstdlib>
3939
#include <fstream>
4040
#include <string>
41-
#include <boost/shared_ptr.hpp>
41+
#include <memory>
4242

4343
#include "process_launcher.h"
4444
#include "gtest/gtest.h"

jdbc.cmake

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,6 @@ if(VS)
9696
list(APPEND jdbc_cmake_opts -DVS=${VS})
9797
endif()
9898

99-
#
100-
# Find Boost which is required by legacy connector
101-
#
102-
103-
#include(boost)
104-
if (DEFINED BOOST_ROOT)
105-
list(APPEND jdbc_cmake_opts -DBOOST_ROOT=${BOOST_ROOT})
106-
endif()
107-
if (DEFINED WITH_BOOST)
108-
list(APPEND jdbc_cmake_opts -DWITH_BOOST=${WITH_BOOST})
109-
endif()
110-
11199
#
112100
# Generate version info for legacy connector
113101
#

jdbc/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ endif()
145145

146146

147147
find_dependency(MySQL)
148-
find_dependency(Boost)
149148

150149

151150
#-----------------
@@ -242,7 +241,6 @@ file(WRITE "${INFO}" "Connector/C++ build information.\n\n")
242241
set(INFO_PREFIX "jdbc-")
243242

244243
merge_libraries(connector-jdbc jdbc)
245-
target_link_libraries(connector-jdbc PUBLIC Boost::boost)
246244

247245

248246
#

jdbc/cmake/DepFindBoost.cmake

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

jdbc/cmake/compiler/CLANG.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
# along with this program; if not, write to the Free Software Foundation, Inc.,
2727
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2828

29-
3029
function(enable_cxx17)
3130

3231
add_flags(CXX -std=c++17)

jdbc/cmake/compiler/MSVC.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,8 @@ set(VS "vs${VS}" CACHE INTERNAL "")
6262
function(enable_pic)
6363
endfunction()
6464

65-
# C++11 is enabled by default for compilers that we support.
66-
6765
function(enable_cxx17)
66+
add_flags(CXX /std:c++17)
6867
endfunction()
6968

7069
# Note: Needs to be implemented if we ever want to change the default

jdbc/cmake/compiler/SUNPRO.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function(enable_cxx17)
5858
# Note: calling _enable_cxx17() did not work on Solaris
5959
#
6060
# With SunPro use GNU libstdc++ implementation of c++ std library. This
61-
# is the default for -std=c++11, but we set it explicitly to be on the safe
61+
# is the default for -std=c++17, but we set it explicitly to be on the safe
6262
# side.
6363
#
6464
add_flags(CXX -std=c++17 -library=stdcpp)

0 commit comments

Comments
 (0)