Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

small fixes

This commit is contained in:
Jan Christoph Uhde 2019-11-25 11:26:52 +01:00
parent 7695403388
commit 473877b3df
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Cache/FrequencyBuffer.h
View File

@ -137,7 +137,7 @@ class FrequencyBuffer {
data.emplace_back(std::pair<T, uint64_t>(f.first, f.second)); data.emplace_back(std::pair<T, uint64_t>(f.first, f.second));
} }
std::sort(data.begin(), data.end(), std::sort(data.begin(), data.end(),
[](std::pair<T, uint64_t>& left, std::pair<T, uint64_t>& right) { [](std::pair<T, uint64_t> const& left, std::pair<T, uint64_t> const& right) {
return left.second < right.second; return left.second < right.second;
}); });

2
lib/Containers/details/short_alloc.h
View File

@ -52,7 +52,7 @@ class arena {
return (n + (alignment - 1)) & ~(alignment - 1); return (n + (alignment - 1)) & ~(alignment - 1);
} }
bool pointer_in_buffer(char* p) noexcept { bool pointer_in_buffer(char* p) const noexcept {
return buf_ <= p && p <= buf_ + N; return buf_ <= p && p <= buf_ + N;
} }
}; };

8
lib/V8/v8-buffer.h
View File

@ -100,9 +100,9 @@ class V8Buffer : public V8Wrapper<V8Buffer, TRI_V8_BUFFER_CID> {
/// @brief the buffer data for a handle /// @brief the buffer data for a handle
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
static inline char* data(v8::Isolate* isolate, v8::Handle<v8::Value> val) { static inline char* data(v8::Isolate* iso, v8::Handle<v8::Value> val) {
TRI_ASSERT(val->IsObject()); TRI_ASSERT(val->IsObject());
v8::Local<v8::Context> context = isolate->GetCurrentContext(); v8::Local<v8::Context> context = iso->GetCurrentContext();
auto o = TRI_GetObject(context, val); auto o = TRI_GetObject(context, val);
int32_t offsetValue = 0; int32_t offsetValue = 0;
@ -155,9 +155,9 @@ class V8Buffer : public V8Wrapper<V8Buffer, TRI_V8_BUFFER_CID> {
/// @brief length of the data for a handle /// @brief length of the data for a handle
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
static inline size_t length(v8::Isolate* isolate, v8::Handle<v8::Value> val) { static inline size_t length(v8::Isolate* iso, v8::Handle<v8::Value> val) {
TRI_ASSERT(val->IsObject()); TRI_ASSERT(val->IsObject());
v8::Local<v8::Context> context = isolate->GetCurrentContext(); v8::Local<v8::Context> context = iso->GetCurrentContext();
auto o = TRI_GetObject(context, val); auto o = TRI_GetObject(context, val);
int32_t lengthValue = -1; int32_t lengthValue = -1;

10
utils/cppcheck.sh
View File

@ -2,6 +2,12 @@
ferr() { echo "$*"; exit 1; } ferr() { echo "$*"; exit 1; }
if [[ -n $* ]];
files=( "$@" )
then
files=( arangod/ arangosh/ lib/ enterprise/ )
fi
cppcheck "$@" \ cppcheck "$@" \
--xml --xml-version=2 \ --xml --xml-version=2 \
-I arangod \ -I arangod \
@ -13,7 +19,7 @@ cppcheck "$@" \
-I lib \ -I lib \
-D USE_PLAN_CACHE \ -D USE_PLAN_CACHE \
--std=c++17 \ --std=c++17 \
--enable=warning,style,performance,portability,missingInclude \ --enable=warning,performance,portability,missingInclude \
--force \ --force \
--quiet \ --quiet \
--platform=unix64 \ --platform=unix64 \
@ -50,7 +56,7 @@ cppcheck "$@" \
--suppress="unreadVariable" \ --suppress="unreadVariable" \
--suppress="useStlAlgorithm" \ --suppress="useStlAlgorithm" \
--suppress="variableScope" \ --suppress="variableScope" \
arangod/ arangosh/ lib/ enterprise/ \ "${files[@]}" \
2> cppcheck.out.xml \ 2> cppcheck.out.xml \
|| ferr "failed to run cppcheck" || ferr "failed to run cppcheck"