From c086b3554de107017f139a0e7ced96427a957895 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 26 May 2015 15:42:36 +0000
Subject: - forgotten to include JSONNode.inl into a project; - these #if
 aren't needed anymore

git-svn-id: http://svn.miranda-ng.org/main/trunk@13848 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/mir_core/mir_core_10.vcxproj         |  1 +
 src/mir_core/mir_core_10.vcxproj.filters |  3 +++
 src/mir_core/mir_core_12.vcxproj         |  1 +
 src/mir_core/mir_core_12.vcxproj.filters |  3 +++
 src/mir_core/src/json/JSONNode.inl       |  2 --
 src/mir_core/src/json/internalJSONNode.h | 14 +++++---------
 6 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/mir_core/mir_core_10.vcxproj b/src/mir_core/mir_core_10.vcxproj
index f41eb0202c..24abcbe7f0 100644
--- a/src/mir_core/mir_core_10.vcxproj
+++ b/src/mir_core/mir_core_10.vcxproj
@@ -95,6 +95,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\include\m_string.inl" />
+    <None Include="src\json\JSONNode.inl" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>mir_core</ProjectName>
diff --git a/src/mir_core/mir_core_10.vcxproj.filters b/src/mir_core/mir_core_10.vcxproj.filters
index a1af8ffb9e..8162971b59 100644
--- a/src/mir_core/mir_core_10.vcxproj.filters
+++ b/src/mir_core/mir_core_10.vcxproj.filters
@@ -167,5 +167,8 @@
     <None Include="..\..\include\m_string.inl">
       <Filter>Header Files</Filter>
     </None>
+    <None Include="src\json\JSONNode.inl">
+      <Filter>Source Files\json</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/mir_core/mir_core_12.vcxproj b/src/mir_core/mir_core_12.vcxproj
index 3e54d32166..3c9ae7f200 100644
--- a/src/mir_core/mir_core_12.vcxproj
+++ b/src/mir_core/mir_core_12.vcxproj
@@ -98,6 +98,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\include\m_string.inl" />
+    <None Include="src\json\JSONNode.inl" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>mir_core</ProjectName>
diff --git a/src/mir_core/mir_core_12.vcxproj.filters b/src/mir_core/mir_core_12.vcxproj.filters
index 8719b38e69..18af03d46d 100644
--- a/src/mir_core/mir_core_12.vcxproj.filters
+++ b/src/mir_core/mir_core_12.vcxproj.filters
@@ -176,5 +176,8 @@
     <None Include="..\..\include\m_string.inl">
       <Filter>Header Files</Filter>
     </None>
+    <None Include="src\json\JSONNode.inl">
+      <Filter>Source Files\json</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/mir_core/src/json/JSONNode.inl b/src/mir_core/src/json/JSONNode.inl
index cf6527f495..9562e3f3ec 100644
--- a/src/mir_core/src/json/JSONNode.inl
+++ b/src/mir_core/src/json/JSONNode.inl
@@ -101,13 +101,11 @@ inline json_string JSONNode::as_string(void) const
 	JSON_CHECK_INTERNAL();
 	return internal -> as_string();
 }
-#if defined(M_STRING_H__)
 inline CMString JSONNode::as_mstring(void) const
 {
 	JSON_CHECK_INTERNAL();
 	return internal->as_mstring();
 }
-#endif
 inline long JSONNode::as_int(void) const
 {
 	JSON_CHECK_INTERNAL();
diff --git a/src/mir_core/src/json/internalJSONNode.h b/src/mir_core/src/json/internalJSONNode.h
index 37d2d236c9..5381d2fcdc 100644
--- a/src/mir_core/src/json/internalJSONNode.h
+++ b/src/mir_core/src/json/internalJSONNode.h
@@ -87,9 +87,7 @@ public:
 		json_string getcomment(void) const;
 	#endif
 	json_string as_string(void) const;
-	#if defined(M_STRING_H__)
-		CMString as_mstring(void) const;
-	#endif
+	CMString as_mstring(void) const;
 	long as_int(void) const;
 	json_number as_float(void) const;
 	bool as_bool(void) const;
@@ -290,12 +288,10 @@ inline json_string internalJSONNode::as_string(void) const {
 	return _string;
 }
 
-#if defined(M_STRING_H__)
-	inline CMString internalJSONNode::as_mstring(void) const {
-		Fetch();
-		return CMString(ptrT(mir_utf8decodeT(_string.c_str())));
-	}
-#endif
+inline CMString internalJSONNode::as_mstring(void) const {
+	Fetch();
+	return CMString(ptrT(mir_utf8decodeT(_string.c_str())));
+}
 
 inline long internalJSONNode::as_int(void) const {
 	Fetch();
-- 
cgit v1.2.3