filereadstream.h (rapidjson-1.0.2) | : | filereadstream.h (rapidjson-1.1.0) | ||
---|---|---|---|---|
skipping to change at line 18 | skipping to change at line 18 | |||
// http://opensource.org/licenses/MIT | // http://opensource.org/licenses/MIT | |||
// | // | |||
// Unless required by applicable law or agreed to in writing, software distribut ed | // Unless required by applicable law or agreed to in writing, software distribut ed | |||
// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR | // under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR | |||
// CONDITIONS OF ANY KIND, either express or implied. See the License for the | // CONDITIONS OF ANY KIND, either express or implied. See the License for the | |||
// specific language governing permissions and limitations under the License. | // specific language governing permissions and limitations under the License. | |||
#ifndef RAPIDJSON_FILEREADSTREAM_H_ | #ifndef RAPIDJSON_FILEREADSTREAM_H_ | |||
#define RAPIDJSON_FILEREADSTREAM_H_ | #define RAPIDJSON_FILEREADSTREAM_H_ | |||
#include "rapidjson.h" | #include "stream.h" | |||
#include <cstdio> | #include <cstdio> | |||
#ifdef __clang__ | ||||
RAPIDJSON_DIAG_PUSH | ||||
RAPIDJSON_DIAG_OFF(padded) | ||||
RAPIDJSON_DIAG_OFF(unreachable-code) | ||||
RAPIDJSON_DIAG_OFF(missing-noreturn) | ||||
#endif | ||||
RAPIDJSON_NAMESPACE_BEGIN | RAPIDJSON_NAMESPACE_BEGIN | |||
//! File byte stream for input using fread(). | //! File byte stream for input using fread(). | |||
/*! | /*! | |||
\note implements Stream concept | \note implements Stream concept | |||
*/ | */ | |||
class FileReadStream { | class FileReadStream { | |||
public: | public: | |||
typedef char Ch; //!< Character type (byte). | typedef char Ch; //!< Character type (byte). | |||
skipping to change at line 88 | skipping to change at line 95 | |||
size_t bufferSize_; | size_t bufferSize_; | |||
Ch *bufferLast_; | Ch *bufferLast_; | |||
Ch *current_; | Ch *current_; | |||
size_t readCount_; | size_t readCount_; | |||
size_t count_; //!< Number of characters read | size_t count_; //!< Number of characters read | |||
bool eof_; | bool eof_; | |||
}; | }; | |||
RAPIDJSON_NAMESPACE_END | RAPIDJSON_NAMESPACE_END | |||
#ifdef __clang__ | ||||
RAPIDJSON_DIAG_POP | ||||
#endif | ||||
#endif // RAPIDJSON_FILESTREAM_H_ | #endif // RAPIDJSON_FILESTREAM_H_ | |||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 12 lines changed or added |