Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding missing includes + renaming parameters to avoid compile errors with -Werror=shadow turned on #14

Closed
wants to merge 1 commit into from
Closed

Adding missing includes + renaming parameters to avoid compile errors with -Werror=shadow turned on #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 22 additions & 19 deletions fbson/FbsonDocument.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
#ifndef FBSON_FBSONDOCUMENT_H
#define FBSON_FBSONDOCUMENT_H

#include <string.h>
#include <assert.h>

namespace fbson {

#pragma pack(push, 1)
Expand Down Expand Up @@ -340,7 +343,7 @@ class NumberValT : public FbsonValue {
unsigned int numPackedBytes() const { return sizeof(FbsonValue) + sizeof(T); }

// catch all unknow specialization of the template class
bool setVal(T val) { return false; }
bool setVal(T value) { return false; }

private:
T num_;
Expand All @@ -352,64 +355,64 @@ typedef NumberValT<int8_t> Int8Val;

// override setVal for Int8Val
template <>
inline bool Int8Val::setVal(int8_t val) {
inline bool Int8Val::setVal(int8_t value) {
if (!isInt8()) {
return false;
}

num_ = val;
num_ = value;
return true;
}

typedef NumberValT<int16_t> Int16Val;

// override setVal for Int16Val
template <>
inline bool Int16Val::setVal(int16_t val) {
inline bool Int16Val::setVal(int16_t value) {
if (!isInt16()) {
return false;
}

num_ = val;
num_ = value;
return true;
}

typedef NumberValT<int32_t> Int32Val;

// override setVal for Int32Val
template <>
inline bool Int32Val::setVal(int32_t val) {
inline bool Int32Val::setVal(int32_t value) {
if (!isInt32()) {
return false;
}

num_ = val;
num_ = value;
return true;
}

typedef NumberValT<int64_t> Int64Val;

// override setVal for Int64Val
template <>
inline bool Int64Val::setVal(int64_t val) {
inline bool Int64Val::setVal(int64_t value) {
if (!isInt64()) {
return false;
}

num_ = val;
num_ = value;
return true;
}

typedef NumberValT<double> DoubleVal;

// override setVal for DoubleVal
template <>
inline bool DoubleVal::setVal(double val) {
inline bool DoubleVal::setVal(double value) {
if (!isDouble()) {
return false;
}

num_ = val;
num_ = value;
return true;
}

Expand All @@ -435,17 +438,17 @@ class BlobVal : public FbsonValue {
char payload_[0];

// set new blob bytes
bool internalSetVal(const char *blob, uint32_t size) {
bool internalSetVal(const char *blob, uint32_t blobSize) {
// if we cannot fit the new blob, fail the operation
if (size > size_) {
if (blobSize > size_) {
return false;
}

memcpy(payload_, blob, size);
memcpy(payload_, blob, blobSize);

// Set the reset of the bytes to 0. Note we cannot change the size_ of the
// current payload, as all values are packed.
memset(payload_ + size, 0, size_ - size);
memset(payload_ + blobSize, 0, size_ - blobSize);

return true;
}
Expand All @@ -458,12 +461,12 @@ class BlobVal : public FbsonValue {
*/
class BinaryVal : public BlobVal {
public:
bool setVal(const char *blob, uint32_t size) {
bool setVal(const char *blob, uint32_t blobSize) {
if (!isBinary()) {
return false;
}

return internalSetVal(blob, size);
return internalSetVal(blob, blobSize);
}

private:
Expand All @@ -476,12 +479,12 @@ class BinaryVal : public BlobVal {
*/
class StringVal : public BlobVal {
public:
bool setVal(const char *str, uint32_t size) {
bool setVal(const char *str, uint32_t blobSize) {
if (!isString()) {
return false;
}

return internalSetVal(str, size);
return internalSetVal(str, blobSize);
}

private:
Expand Down