From 4f74f805c256e6151c0958dea3663d408dae2486 Mon Sep 17 00:00:00 2001 From: jbeder Date: Tue, 27 Oct 2009 14:55:01 +0000 Subject: [PATCH] Removed crt stuff (we can do memory leak checking in Linux easier) --- include/crt.h | 17 ----------------- include/yaml.h | 1 - src/aliascontent.cpp | 1 - src/content.cpp | 13 ------------- src/content.h | 4 ++-- src/exp.cpp | 1 - src/iterator.cpp | 1 - src/map.cpp | 1 - src/node.cpp | 1 - src/parser.cpp | 1 - src/parserstate.cpp | 1 - src/regex.cpp | 1 - src/scalar.cpp | 1 - src/scanner.cpp | 1 - src/scanscalar.cpp | 1 - src/scantoken.cpp | 1 - src/sequence.cpp | 1 - src/simplekey.cpp | 1 - src/stream.cpp | 1 - test/main.cpp | 4 ---- 20 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 include/crt.h delete mode 100644 src/content.cpp diff --git a/include/crt.h b/include/crt.h deleted file mode 100644 index 667b60a..0000000 --- a/include/crt.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#ifndef CRT_H_62B23520_7C8E_11DE_8A39_0800200C9A66 -#define CRT_H_62B23520_7C8E_11DE_8A39_0800200C9A66 - - -// for detecting memory leaks -#ifdef _DEBUG - -#define _CRTDBG_MAP_ALLOC -#include -#include - -#endif // _DEBUG - - -#endif // CRT_H_62B23520_7C8E_11DE_8A39_0800200C9A66 diff --git a/include/yaml.h b/include/yaml.h index 0f91428..6950ad7 100644 --- a/include/yaml.h +++ b/include/yaml.h @@ -4,7 +4,6 @@ #define YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66 -#include "crt.h" #include "parser.h" #include "node.h" #include "iterator.h" diff --git a/src/aliascontent.cpp b/src/aliascontent.cpp index aa0f399..305abdc 100644 --- a/src/aliascontent.cpp +++ b/src/aliascontent.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "aliascontent.h" namespace YAML diff --git a/src/content.cpp b/src/content.cpp deleted file mode 100644 index 850dcab..0000000 --- a/src/content.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "crt.h" -#include "content.h" - -namespace YAML -{ - Content::Content() - { - } - - Content::~Content() - { - } -} diff --git a/src/content.h b/src/content.h index 71e7037..90e265c 100644 --- a/src/content.h +++ b/src/content.h @@ -23,8 +23,8 @@ namespace YAML class Content { public: - Content(); - virtual ~Content(); + Content() {} + virtual ~Content() {} virtual Content *Clone() const = 0; diff --git a/src/exp.cpp b/src/exp.cpp index 22080c6..8dd3479 100644 --- a/src/exp.cpp +++ b/src/exp.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "exp.h" #include "exceptions.h" #include diff --git a/src/iterator.cpp b/src/iterator.cpp index 51e52a3..5d3bc9b 100644 --- a/src/iterator.cpp +++ b/src/iterator.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "node.h" #include "exceptions.h" #include "iterpriv.h" diff --git a/src/map.cpp b/src/map.cpp index 6d8873e..4607966 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "map.h" #include "node.h" #include "scanner.h" diff --git a/src/node.cpp b/src/node.cpp index c604e43..680729a 100644 --- a/src/node.cpp +++ b/src/node.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "node.h" #include "token.h" #include "scanner.h" diff --git a/src/parser.cpp b/src/parser.cpp index 1709436..b08a08e 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "parser.h" #include "scanner.h" #include "token.h" diff --git a/src/parserstate.cpp b/src/parserstate.cpp index 40adb03..8b9531a 100644 --- a/src/parserstate.cpp +++ b/src/parserstate.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "parserstate.h" namespace YAML diff --git a/src/regex.cpp b/src/regex.cpp index 7c3f8f5..b35b1f4 100644 --- a/src/regex.cpp +++ b/src/regex.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "regex.h" namespace YAML diff --git a/src/scalar.cpp b/src/scalar.cpp index a7ccda9..dbf45b3 100644 --- a/src/scalar.cpp +++ b/src/scalar.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "scalar.h" #include "scanner.h" #include "token.h" diff --git a/src/scanner.cpp b/src/scanner.cpp index 552a0cf..725aadc 100644 --- a/src/scanner.cpp +++ b/src/scanner.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "scanner.h" #include "token.h" #include "exceptions.h" diff --git a/src/scanscalar.cpp b/src/scanscalar.cpp index cdbdb60..b3a84cb 100644 --- a/src/scanscalar.cpp +++ b/src/scanscalar.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "scanscalar.h" #include "scanner.h" #include "exp.h" diff --git a/src/scantoken.cpp b/src/scantoken.cpp index 80999bd..5bc0c17 100644 --- a/src/scantoken.cpp +++ b/src/scantoken.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "scanner.h" #include "token.h" #include "exceptions.h" diff --git a/src/sequence.cpp b/src/sequence.cpp index ba38e2c..467826f 100644 --- a/src/sequence.cpp +++ b/src/sequence.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "sequence.h" #include "node.h" #include "scanner.h" diff --git a/src/simplekey.cpp b/src/simplekey.cpp index e16dff9..6a605f0 100644 --- a/src/simplekey.cpp +++ b/src/simplekey.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "scanner.h" #include "token.h" #include "exceptions.h" diff --git a/src/stream.cpp b/src/stream.cpp index 5cc9ea9..0d1426a 100644 --- a/src/stream.cpp +++ b/src/stream.cpp @@ -1,4 +1,3 @@ -#include "crt.h" #include "stream.h" #include #include "exp.h" diff --git a/test/main.cpp b/test/main.cpp index 881bc57..64c69f1 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -2,10 +2,6 @@ int main() { -#ifdef WINDOWS - _CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF|_CRTDBG_ALLOC_MEM_DF); -#endif // WINDOWS Test::RunAll(); - return 0; }