From: Kimmo Varis Date: Wed, 8 Apr 2009 18:54:31 +0000 (+0000) Subject: Remove MFC dependency from varprop class. X-Git-Tag: 2.16.5~2420 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f63c00f42869c44495825d7d5a1e13fa162ab437;p=winmerge-jp%2Fwinmerge-jp.git Remove MFC dependency from varprop class. --- diff --git a/Src/Common/varprop.cpp b/Src/Common/varprop.cpp index 2ab730967..76dc99f42 100644 --- a/Src/Common/varprop.cpp +++ b/Src/Common/varprop.cpp @@ -7,14 +7,9 @@ // $Id$ ////////////////////////////////////////////////////////////////////// -#include "StdAfx.h" +#include "windows.h" #include "varprop.h" - -#ifdef _DEBUG -#undef THIS_FILE -static char THIS_FILE[]=__FILE__; -#define new DEBUG_NEW -#endif +#include "assert.h" namespace varprop { @@ -145,7 +140,7 @@ void VariantValue::Clear() */ bool VariantValue::GetBool() const { - ASSERT(m_vtype == VT_BOOL); + assert(m_vtype == VT_BOOL); return m_bvalue; } @@ -155,7 +150,7 @@ bool VariantValue::GetBool() const */ int VariantValue::GetInt() const { - ASSERT(m_vtype == VT_INT); + assert(m_vtype == VT_INT); return m_ivalue; } @@ -165,7 +160,7 @@ int VariantValue::GetInt() const */ double VariantValue::GetFloat() const { - ASSERT(m_vtype == VT_FLOAT); + assert(m_vtype == VT_FLOAT); return m_fvalue; } @@ -175,7 +170,7 @@ double VariantValue::GetFloat() const */ String VariantValue::GetString() const { - ASSERT(m_vtype == VT_STRING); + assert(m_vtype == VT_STRING); return m_svalue; } @@ -185,7 +180,7 @@ String VariantValue::GetString() const */ time_t VariantValue::GetTime() const { - ASSERT(m_vtype == VT_TIME); + assert(m_vtype == VT_TIME); return m_tvalue; } diff --git a/Src/Common/varprop.h b/Src/Common/varprop.h index 4698b424c..5d56e1fd5 100644 --- a/Src/Common/varprop.h +++ b/Src/Common/varprop.h @@ -10,6 +10,8 @@ #ifndef varprop_h_included #define varprop_h_included +#include "UnicodeString.h" + namespace varprop { diff --git a/Src/Merge.vcproj b/Src/Merge.vcproj index 10d51ef80..fbd9c1395 100644 --- a/Src/Merge.vcproj +++ b/Src/Merge.vcproj @@ -5802,7 +5802,10 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile=""/> @@ -5811,6 +5814,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1"/> + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile=""/>