unittest.cpp (rapidjson-1.0.2) | : | unittest.cpp (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. | |||
#include "unittest.h" | #include "unittest.h" | |||
#include "rapidjson/rapidjson.h" | #include "rapidjson/rapidjson.h" | |||
#ifdef __clang__ | ||||
#pragma GCC diagnostic push | ||||
#if __has_warning("-Wdeprecated") | ||||
#pragma GCC diagnostic ignored "-Wdeprecated" | ||||
#endif | ||||
#endif | ||||
AssertException::~AssertException() throw() {} | ||||
#ifdef __clang__ | ||||
#pragma GCC diagnostic pop | ||||
#endif | ||||
int main(int argc, char **argv) { | int main(int argc, char **argv) { | |||
::testing::InitGoogleTest(&argc, argv); | ::testing::InitGoogleTest(&argc, argv); | |||
std::cout << "RapidJSON v" << RAPIDJSON_VERSION_STRING << std::endl; | std::cout << "RapidJSON v" << RAPIDJSON_VERSION_STRING << std::endl; | |||
#if _MSC_VER | #ifdef _MSC_VER | |||
_CrtMemState memoryState = { 0 }; | _CrtMemState memoryState = { 0 }; | |||
(void)memoryState; | ||||
_CrtMemCheckpoint(&memoryState); | _CrtMemCheckpoint(&memoryState); | |||
//_CrtSetBreakAlloc(X); | //_CrtSetBreakAlloc(X); | |||
//void *testWhetherMemoryLeakDetectionWorks = malloc(1); | //void *testWhetherMemoryLeakDetectionWorks = malloc(1); | |||
#endif | #endif | |||
int ret = RUN_ALL_TESTS(); | int ret = RUN_ALL_TESTS(); | |||
#if _MSC_VER | #ifdef _MSC_VER | |||
// Current gtest constantly leak 2 blocks at exit | // Current gtest constantly leak 2 blocks at exit | |||
_CrtMemDumpAllObjectsSince(&memoryState); | _CrtMemDumpAllObjectsSince(&memoryState); | |||
#endif | #endif | |||
return ret; | return ret; | |||
} | } | |||
End of changes. 4 change blocks. | ||||
2 lines changed or deleted | 16 lines changed or added |