Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/miloyip/rapidjson.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilo Yip <miloyip@gmail.com>2022-04-06 07:27:10 +0300
committerGitHub <noreply@github.com>2022-04-06 07:27:10 +0300
commitbdc49ad80a3cff89a25839dcdcd6a68b457ec9f1 (patch)
tree3fe712d1c0121df1c2d08fd9c6e519c32141fd07
parent8261c1ddf43f10de00fd8c9a67811d1486b2c784 (diff)
parent6b500986c4c8d3f7fb276013be9e2d17177301fb (diff)
Merge pull request #2014 from lazydroid/dev/lenik/fix_shadowed_variables
fix shadowed variable
-rw-r--r--include/rapidjson/reader.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/rapidjson/reader.h b/include/rapidjson/reader.h
index b37afffb..55546601 100644
--- a/include/rapidjson/reader.h
+++ b/include/rapidjson/reader.h
@@ -1433,7 +1433,7 @@ private:
class NumberStream<InputStream, StackCharacter, true, false> : public NumberStream<InputStream, StackCharacter, false, false> {
typedef NumberStream<InputStream, StackCharacter, false, false> Base;
public:
- NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is), stackStream(reader.stack_) {}
+ NumberStream(GenericReader& reader, InputStream& s) : Base(reader, s), stackStream(reader.stack_) {}
RAPIDJSON_FORCEINLINE Ch TakePush() {
stackStream.Put(static_cast<StackCharacter>(Base::is.Peek()));
@@ -1459,7 +1459,7 @@ private:
class NumberStream<InputStream, StackCharacter, true, true> : public NumberStream<InputStream, StackCharacter, true, false> {
typedef NumberStream<InputStream, StackCharacter, true, false> Base;
public:
- NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is) {}
+ NumberStream(GenericReader& reader, InputStream& s) : Base(reader, s) {}
RAPIDJSON_FORCEINLINE Ch Take() { return Base::TakePush(); }
};