Remove MFC dependency from varprop class.

diff --git a/Src/Common/varprop.cpp b/Src/Common/varprop.cpp
index 2ab7309..76dc99f 100644 (file)
--- 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 4698b42..5d56e1f 100644 (file)
--- 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 10d51ef..fbd9c13 100644 (file)
--- a/Src/Merge.vcproj
+++ b/Src/Merge.vcproj
@@ -5802,7 +5802,10 @@
                                                Name="VCCLCompilerTool"
                                                Optimization="1"
                                                AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""/>
+                                               PreprocessorDefinitions=""
+                                               UsePrecompiledHeader="0"
+                                               PrecompiledHeaderThrough=""
+                                               PrecompiledHeaderFile=""/>
                                </FileConfiguration>
                                <FileConfiguration
                                        Name="UnicodeDebug|Win32">
@@ -5811,6 +5814,9 @@
                                                Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               UsePrecompiledHeader="0"
+                                               PrecompiledHeaderThrough=""
+                                               PrecompiledHeaderFile=""
                                                BrowseInformation="1"/>
                                </FileConfiguration>
                                <FileConfiguration
@@ -5820,6 +5826,9 @@
                                                Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               UsePrecompiledHeader="0"
+                                               PrecompiledHeaderThrough=""
+                                               PrecompiledHeaderFile=""
                                                BrowseInformation="1"/>
                                </FileConfiguration>
                                <FileConfiguration
@@ -5828,7 +5837,10 @@
                                                Name="VCCLCompilerTool"
                                                Optimization="1"
                                                AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""/>
+                                               PreprocessorDefinitions=""
+                                               UsePrecompiledHeader="0"
+                                               PrecompiledHeaderThrough=""
+                                               PrecompiledHeaderFile=""/>
                                </FileConfiguration>
                        </File>
                        <File