Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

Commit fbe4025

Browse files
Merge pull request #1052 from kilobyte/codespell
Fix a bunch of typos.
2 parents 7cc2f38 + 3292e6f commit fbe4025

18 files changed

Lines changed: 32 additions & 32 deletions

ChangeLog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Wed Sep 30 2020 Szymon Romik <szymon.romik@intel.com>
5858
- string_view class (support for compilers older than C++17)
5959
- experimental self_relative_ptr and std::atomic<self_relative_ptr>
6060
specialization (persistent smart ptr which encapsulates the self
61-
offseted pointer and provides member access, dereference and
61+
offsetted pointer and provides member access, dereference and
6262
array access operators - for some workloads it could be faster
6363
alternative for persistent_ptr)
6464

@@ -88,7 +88,7 @@ Thu May 28 2020 Szymon Romik <szymon.romik@intel.com>
8888

8989
Optimizations:
9090
- optimized clear() and erase() for trivial types in segment_vector
91-
- optimized move constructor and assignement for basic_string
91+
- optimized move constructor and assignment for basic_string
9292

9393
Bug Fixes:
9494
- fixed free_data() in concurrent_hash_map

cmake/functions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ endfunction()
201201
# src version shows the current version, as reported by git describe
202202
# unless git is not available, then it's set to the recently released VERSION
203203
function(set_source_ver SRCVERSION)
204-
# if there's version file commited, use it
204+
# if there's version file committed, use it
205205
if(EXISTS "${LIBPMEMOBJCPP_ROOT_DIR}/.version")
206206
file(STRINGS ${LIBPMEMOBJCPP_ROOT_DIR}/.version FILE_VERSION)
207207
set(SRCVERSION ${FILE_VERSION} PARENT_SCOPE)

examples/concurrent_hash_map/concurrent_hash_map.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ main(int argc, char *argv[])
186186
}
187187
pop.close();
188188
} catch (std::exception &e) {
189-
std::cerr << "Exception occured: " << e.what() << std::endl;
189+
std::cerr << "Exception occurred: " << e.what() << std::endl;
190190
try {
191191
pop.close();
192192
} catch (const std::logic_error &e) {

examples/concurrent_hash_map/concurrent_hash_map_string.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ main(int argc, char *argv[])
203203
});
204204
}
205205
} catch (std::exception &e) {
206-
std::cerr << "Exception occured: " << e.what() << std::endl;
206+
std::cerr << "Exception occurred: " << e.what() << std::endl;
207207
retval = -1;
208208
}
209209
try {

examples/radix_tree/radix_tree_inline_string.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: BSD-3-Clause
2-
/* Copyright 2020, Intel Corporation */
2+
/* Copyright 2020-2021, Intel Corporation */
33

44
/**
55
* radix_tree_inline_string.cpp -- example which shows how to use
@@ -62,7 +62,7 @@ insert_elements_kv(pmem::obj::pool<root> pop)
6262
assert(pmem::obj::string_view(it->value())
6363
.compare("some long string") == 0);
6464

65-
/* If reallocation happend on assign_val, it2 will be
65+
/* If reallocation happened on assign_val, it2 will be
6666
* invalidated */
6767
(void)it2;
6868

include/libpmemobj++/container/basic_string.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: BSD-3-Clause
2-
/* Copyright 2019-2020, Intel Corporation */
2+
/* Copyright 2019-2021, Intel Corporation */
33

44
/**
55
* @file
@@ -697,7 +697,7 @@ basic_string<CharT, Traits>::basic_string(std::initializer_list<CharT> ilist)
697697
}
698698

699699
/**
700-
* Implicitly converts argument to a string view then initilizes
700+
* Implicitly converts argument to a string view then initializes
701701
* the string with the content of string view.
702702
*
703703
* @param[in] t object (convertible to std::basic_string_view)
@@ -725,7 +725,7 @@ basic_string<CharT, Traits>::basic_string(const T &t)
725725
}
726726

727727
/**
728-
* Implicitly converts argument to a string view then initilizes
728+
* Implicitly converts argument to a string view then initializes
729729
* the string with the subrange [pos, pos + n) of string view.
730730
*
731731
* @param[in] t object (convertible to std::basic_string_view)

include/libpmemobj++/container/concurrent_hash_map.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: BSD-3-Clause
2-
/* Copyright 2019-2020, Intel Corporation */
2+
/* Copyright 2019-2021, Intel Corporation */
33

44
/**
55
* @file
@@ -1028,7 +1028,7 @@ class hash_map_base {
10281028

10291029
/*
10301030
* Should be called before concurrent_hash_map destructor is called.
1031-
* Otherwise, program can terminate if an exception occurs wile freeing
1031+
* Otherwise, program can terminate if an exception occurs while freeing
10321032
* memory inside dtor.
10331033
*/
10341034
void

include/libpmemobj++/container/detail/concurrent_skip_list_impl.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: BSD-3-Clause
2-
/* Copyright 2020, Intel Corporation */
2+
/* Copyright 2020-2021, Intel Corporation */
33

44
#ifndef PMEMOBJ_CONCURRENT_SKIP_LIST_IMPL_HPP
55
#define PMEMOBJ_CONCURRENT_SKIP_LIST_IMPL_HPP
@@ -720,8 +720,8 @@ class concurrent_skip_list {
720720
}
721721

722722
/**
723-
* Intialize concurrent_skip_list after process restart.
724-
* MUST be called everytime after process restart.
723+
* Initialize concurrent_skip_list after process restart.
724+
* MUST be called every time after process restart.
725725
* Not thread safe.
726726
*
727727
*/
@@ -3060,7 +3060,7 @@ class concurrent_skip_list {
30603060
* Each node object has different size which depends on number of layers
30613061
* the node is linked. In this method we calculate the size of the new
30623062
* node based on the node height. Then required amount of bytes are
3063-
* allcoated and casted to the persistent_node_ptr.
3063+
* allocated and casted to the persistent_node_ptr.
30643064
*
30653065
* @pre Should be called inside transaction.
30663066
*/

include/libpmemobj++/detail/self_relative_ptr_base_impl.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: BSD-3-Clause
2-
/* Copyright 2020, Intel Corporation */
2+
/* Copyright 2020-2021, Intel Corporation */
33

44
/**
55
* @file
@@ -291,7 +291,7 @@ class self_relative_ptr_base_impl {
291291
};
292292

293293
/**
294-
* Static class accesssor to self_relative_ptr_base
294+
* Static class accessor to self_relative_ptr_base
295295
*/
296296
template <typename T>
297297
class self_relative_accessor {

include/libpmemobj++/experimental/self_relative_ptr.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: BSD-3-Clause
2-
/* Copyright 2020, Intel Corporation */
2+
/* Copyright 2020-2021, Intel Corporation */
33

44
/**
55
* @file
@@ -25,7 +25,7 @@ namespace experimental
2525
* Persistent self-relative pointer class.
2626
*
2727
* self_relative_ptr implements a smart ptr. It encapsulates the
28-
* self offseted pointer and provides member access, dereference and array
28+
* self offsetted pointer and provides member access, dereference and array
2929
* access operators.
3030
*
3131
* @includedoc shared/pointer_requirements.txt

0 commit comments

Comments
 (0)