Adds a forward declaration for DataParamEntry to avoid circular depen…

…dencies
EA31337 · Apr 20, 2021 · 0792363 · 0792363
1 parent bb8e5f2
commit 0792363
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 11 deletions.
diff --git a/Chart.define.h b/Chart.define.h
@@ -75,4 +75,4 @@
 #define MODE_MARGINHEDGED 31
 #define MODE_MARGINREQUIRED 32
 #define MODE_FREEZELEVEL 33
-#endif
+#endif
diff --git a/Chart.struct.h b/Chart.struct.h
@@ -424,4 +424,4 @@ struct ChartPriceOpen {
   static double Get(const string _symbol, const ENUM_TIMEFRAMES _tf, const int _shift) {
     return ChartHistory::iOpen(_symbol, _tf, _shift);
   }
-};
+};
diff --git a/Chart.struct.tf.h b/Chart.struct.tf.h
@@ -220,4 +220,4 @@ SerializerNodeType ChartTf::Serialize(Serializer& s) {
   s.PassEnum(this, "tf", tf);
   s.PassEnum(this, "tfi", tfi);
   return SerializerNodeObject;
-}
+}
diff --git a/Data.define.h b/Data.define.h
@@ -40,4 +40,4 @@
 #define LONG_VALUE INT_VALUE
 //---
 #define EMPTY -1
-#endif
+#endif
diff --git a/Order.define.h b/Order.define.h
@@ -38,4 +38,4 @@
 #define OP_SELLSTOP ORDER_TYPE_SELL_STOP    // Pending order of SELL STOP type
 #define OP_BALANCE 6
 // --
-#endif
+#endif
diff --git a/SymbolInfo.define.h b/SymbolInfo.define.h
@@ -31,4 +31,4 @@
 // --
 #define Point _Point
 #define Digits _Digits
-#endif
+#endif
diff --git a/tests/ActionTest.mq5 b/tests/ActionTest.mq5
@@ -27,6 +27,9 @@
 // Defines.
 #define ACTION_EA_ENABLED
 
+// Forward declaration.
+struct DataParamEntry;
+
 // Includes.
 #include "../Action.mqh"
 #include "../DictObject.mqh"

diff --git a/tests/ConditionTest.mq5 b/tests/ConditionTest.mq5
@@ -24,6 +24,9 @@
  * Test functionality of Condition class.
  */
 
+// Forward declaration.
+struct DataParamEntry;
+
 // Includes.
 #include "../Condition.mqh"
 #include "../DictObject.mqh"

diff --git a/tests/ConvertTest.mq5 b/tests/ConvertTest.mq5
@@ -95,11 +95,11 @@ int OnInit() {
   assertTrueOrFail(Convert::PointsToValue(10, 0, 5) == 0.00010, "Invalid conversion of points to value");
 
   // Test GetPipDiff().
-  assertTrueOrFail(Convert::GetValueDiffInPips(0.00010, 0.00020, True, 4) == 1, "Invalid result of diff value");
-  assertTrueOrFail(Convert::GetValueDiffInPips(0.00020, 0.00010, False, 4) == 1, "Invalid result of diff value");
-  assertTrueOrFail(Convert::GetValueDiffInPips(0.00020, 0.00010, False, 5) == 1, "Invalid result of diff value");
-  assertTrueOrFail(Convert::GetValueDiffInPips(0.00400, 0.00200, False, 4) == 20, "Invalid result of diff value");
-  assertTrueOrFail(Convert::GetValueDiffInPips(0.00400, 0.00200, False, 5) == 20, "Invalid result of diff value");
+  assertTrueOrFail(Convert::GetValueDiffInPips(0.00010, 0.00020, true, 4) == 1, "Invalid result of diff value");
+  assertTrueOrFail(Convert::GetValueDiffInPips(0.00020, 0.00010, false, 4) == 1, "Invalid result of diff value");
+  assertTrueOrFail(Convert::GetValueDiffInPips(0.00020, 0.00010, false, 5) == 1, "Invalid result of diff value");
+  assertTrueOrFail(Convert::GetValueDiffInPips(0.00400, 0.00200, false, 4) == 20, "Invalid result of diff value");
+  assertTrueOrFail(Convert::GetValueDiffInPips(0.00400, 0.00200, false, 5) == 20, "Invalid result of diff value");
 
   // Test ValueWithCurrency().
   // Print("Euro sign: " + ShortToString(0x20A0));

diff --git a/tests/EATest.mq5 b/tests/EATest.mq5
@@ -24,6 +24,9 @@
  * Test functionality of EA class.
  */
 
+// Forward declaration.
+struct DataParamEntry;
+
 // Includes.
 #include "../EA.mqh"
 #include "../Test.mqh"

diff --git a/tests/IndicatorsTest.mq5 b/tests/IndicatorsTest.mq5
@@ -27,6 +27,9 @@
 // Defines.
 //#define __debug__  // Enables debug.
 
+// Forward declaration.
+struct DataParamEntry;
+
 // Includes.
 #include "../Dict.mqh"
 #include "../DictObject.mqh"

diff --git a/tests/TradeTest.mq5 b/tests/TradeTest.mq5
@@ -24,6 +24,9 @@
  * Test functionality of Trade class.
  */
 
+// Forward declaration.
+struct DataParamEntry;
+
 // Includes.
 #include "../Test.mqh"
 #include "../Trade.mqh"
-Original file line number
+Diff line change
@@ Expand Up / @@ -424,4 +424,4 @@ struct ChartPriceOpen { @@
       static double Get(const string _symbol, const ENUM_TIMEFRAMES _tf, const int _shift) {
         return ChartHistory::iOpen(_symbol, _tf, _shift);
       }
-    };
+    };