organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #260 from ejsd1989/issue-#242

Browse source 
Removes redundant null pointer checks checks
This commit is contained in:
Joshua Haberman 2016-02-16 16:47:46 -08:00
commit d41db75dcb
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
View file

@ -107,7 +107,7 @@ class MockGeneratorContext : public GeneratorContext {
virtual io::ZeroCopyOutputStream* Open(const string& filename) {
string** map_slot = &files_[filename];
if (*map_slot != NULL) delete *map_slot;
delete *map_slot;
*map_slot = new string;
return new io::StringOutputStream(*map_slot);

4
src/google/protobuf/io/gzip_stream.cc
View file

@ -241,9 +241,7 @@ void GzipOutputStream::Init(ZeroCopyOutputStream* sub_stream,
GzipOutputStream::~GzipOutputStream() {
Close();
if (input_buffer_ != NULL) {
operator delete(input_buffer_);
}
operator delete(input_buffer_);
}
// private