Merge pull request #2293 from smartdevicelink/feature/data_turn_signalfix/remove_commented_codefeature/make_makeshared_support_variadic_templatesfeature/increase_policy_utests_speed

Feature/data turn signal

1 files changed, 7 insertions, 7 deletions

diff --git a/src/components/policy/policy_external/src/policy_table/enums.cc b/src/components/policy/policy_external/src/policy_table/enums.cc
index 5a9e403053..cb724e93b1 100644
--- a/src/components/policy/policy_external/src/policy_table/enums.cc
+++ b/src/components/policy/policy_external/src/policy_table/enums.cc
@@ -118,6 +118,8 @@ bool IsValidEnum(Parameter val) {
       return true;
     case P_EXTERNALTEMPERATURE:
       return true;
+    case P_TURNSIGNAL:
+      return true;
     case P_FUELLEVEL:
       return true;
     case P_FUELLEVEL_STATE:
@@ -166,8 +168,6 @@ bool IsValidEnum(Parameter val) {
       return true;
     case P_ABS_STATE:
       return true;
-    case P_TURN_SIGNAL:
-      return true;
     case P_FUEL_RANGE:
       return true;
     case P_TIRE_PRESSURE_VALUE:
@@ -211,6 +211,8 @@ const char* EnumToJsonString(Parameter val) {
       return "engineTorque";
     case P_EXTERNALTEMPERATURE:
       return "externalTemperature";
+    case P_TURNSIGNAL:
+      return "turnSignal";
     case P_FUELLEVEL:
       return "fuelLevel";
     case P_FUELLEVEL_STATE:
@@ -259,8 +261,6 @@ const char* EnumToJsonString(Parameter val) {
       return "eCallInfo";
     case P_ABS_STATE:
       return "abs_State";
-    case P_TURN_SIGNAL:
-      return "turnSignal";
     case P_FUEL_RANGE:
       return "fuelRange";
     case P_TIRE_PRESSURE_VALUE:
@@ -307,6 +307,9 @@ bool EnumFromJsonString(const std::string& literal, Parameter* result) {
   } else if ("externalTemperature" == literal) {
     *result = P_EXTERNALTEMPERATURE;
     return true;
+  } else if ("turnSignal" == literal) {
+    *result = P_TURNSIGNAL;
+    return true;
   } else if ("fuelLevel" == literal) {
     *result = P_FUELLEVEL;
     return true;
@@ -379,9 +382,6 @@ bool EnumFromJsonString(const std::string& literal, Parameter* result) {
   } else if ("abs_State" == literal) {
     *result = P_ABS_STATE;
     return true;
-  } else if ("turnSignal" == literal) {
-    *result = P_TURN_SIGNAL;
-    return true;
   } else if ("fuelRange" == literal) {
     *result = P_FUEL_RANGE;
     return true;