Commit e5e3100d authored by Kenton Varda's avatar Kenton Varda

Merge pull request #22 from dwrensha/typos

typos
parents 0da57538 23538632
...@@ -37,7 +37,7 @@ Arena::~Arena() noexcept(false) {} ...@@ -37,7 +37,7 @@ Arena::~Arena() noexcept(false) {}
void ReadLimiter::unread(WordCount64 amount) { void ReadLimiter::unread(WordCount64 amount) {
// Be careful not to overflow here. Since ReadLimiter has no thread-safety, it's possible that // Be careful not to overflow here. Since ReadLimiter has no thread-safety, it's possible that
// the limit value was not updated correctly for one or more reads, and therefore unread() could // the limit value was not updated correctly for one or more reads, and therefore unread() could
// overflow it even if it is only unreading bytes that were acutally read. // overflow it even if it is only unreading bytes that were actually read.
uint64_t oldValue = limit; uint64_t oldValue = limit;
uint64_t newValue = oldValue + amount / WORDS; uint64_t newValue = oldValue + amount / WORDS;
if (newValue > oldValue) { if (newValue > oldValue) {
......
...@@ -434,7 +434,7 @@ int main(int argc, char* argv[]) { ...@@ -434,7 +434,7 @@ int main(int argc, char* argv[]) {
break; break;
case Mode::BYTES: case Mode::BYTES:
cout << "* in-memory I/O" << endl; cout << "* in-memory I/O" << endl;
cout << " * with client an server in the same thread" << endl; cout << " * with client and server in the same thread" << endl;
break; break;
case Mode::PIPE_SYNC: case Mode::PIPE_SYNC:
cout << "* pipe I/O" << endl; cout << "* pipe I/O" << endl;
......
...@@ -131,7 +131,7 @@ class word { uint64_t content KJ_UNUSED_MEMBER; KJ_DISALLOW_COPY(word); public: ...@@ -131,7 +131,7 @@ class word { uint64_t content KJ_UNUSED_MEMBER; KJ_DISALLOW_COPY(word); public:
// arithmetic clearer. Since the contents are private, the only way to access them is to first // arithmetic clearer. Since the contents are private, the only way to access them is to first
// reinterpret_cast to some other pointer type. // reinterpret_cast to some other pointer type.
// //
// Coping is disallowed because you should always use memcpy(). Otherwise, you may run afoul of // Copying is disallowed because you should always use memcpy(). Otherwise, you may run afoul of
// aliasing rules. // aliasing rules.
// //
// A pointer of type word* should always be word-aligned even if won't actually be dereferenced as // A pointer of type word* should always be word-aligned even if won't actually be dereferenced as
......
...@@ -737,7 +737,7 @@ TEST(Encoding, UpgradeStructInBuilder) { ...@@ -737,7 +737,7 @@ TEST(Encoding, UpgradeStructInBuilder) {
TEST(Encoding, UpgradeStructInBuilderMultiSegment) { TEST(Encoding, UpgradeStructInBuilderMultiSegment) {
// Exactly like the previous test, except that we force multiple segments. Since we force a // Exactly like the previous test, except that we force multiple segments. Since we force a
// separate segment for every object, every pointer is a far pointer, and far pointers are easily // separate segment for every object, every pointer is a far pointer, and far pointers are easily
// transferred, so this is acutally not such a complicated case. // transferred, so this is actually not such a complicated case.
MallocMessageBuilder builder(0, AllocationStrategy::FIXED_SIZE); MallocMessageBuilder builder(0, AllocationStrategy::FIXED_SIZE);
auto root = builder.initRoot<test::TestObject>(); auto root = builder.initRoot<test::TestObject>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment