[patch] openhpi-3.0.0-gcc6.patch

openhpi-3.0.0-gcc6.patch (text/plain), 3.76 KB, created by Peter Levine on 2016-09-15 16:15:26 UTC

--- plugins/dynamic_simulator/new_sim_file_annunciator.cpp.old	2016-09-15 11:35:22.103424650 -0400
+++ plugins/dynamic_simulator/new_sim_file_annunciator.cpp	2016-09-15 11:36:42.036360140 -0400
@@ -69,7 +69,7 @@
    
    if (cur_token != G_TOKEN_LEFT_CURLY) {
    	  err("Processing parse configuration: Expected left curly token.");
-      return false;
+      return NULL;
    }
    m_depth++;
    
--- plugins/dynamic_simulator/new_sim_file_control.cpp.old	2016-09-15 11:30:17.232318278 -0400
+++ plugins/dynamic_simulator/new_sim_file_control.cpp	2016-09-15 11:32:23.172431896 -0400
@@ -78,7 +78,7 @@
    
    if (cur_token != G_TOKEN_LEFT_CURLY) {
    	  err("Processing parse configuration: Expected left curly token.");
-      return false;
+      return NULL;
    }
    m_depth++;
    
@@ -157,7 +157,7 @@
             } else if (!strcmp(field, "TypeUnion.Text")) {
          	   if (cur_token != G_TOKEN_LEFT_CURLY) {
          	      err("Processing parse control rdr entry - Missing left curly at TypeUnion");
-         	      return false;
+         	      return NULL;
          	   } else {
          	      success = process_type_text();
                }
@@ -165,7 +165,7 @@
          	} else if (!strcmp(field, "TypeUnion.Oem")) {
          	   if (cur_token != G_TOKEN_LEFT_CURLY) {
          	      err("Processing parse control rdr entry - Missing left curly at TypeUnion");
-         	      return false;
+         	      return NULL;
          	   } else {
          	      success = process_type_oem();
                }
@@ -214,7 +214,7 @@
          	      field = g_strdup(m_scanner->value.v_string);
          	   } else {
          	   	 err("Processing parse control GET token - don't find field string");
-         	   	 return false;
+         	   	 return NULL;
          	   }
          	   
                cur_token = g_scanner_get_next_token(m_scanner);
--- plugins/dynamic_simulator/new_sim_file_dimi.cpp.old	2016-09-15 11:42:00.613902802 -0400
+++ plugins/dynamic_simulator/new_sim_file_dimi.cpp	2016-09-15 11:42:26.362452171 -0400
@@ -71,7 +71,7 @@
    
    if (cur_token != G_TOKEN_LEFT_CURLY) {
    	  err("Processing parse configuration: Expected left curly token.");
-      return false;
+      return NULL;
    }
    m_depth++;
    
--- plugins/dynamic_simulator/new_sim_file_fumi.cpp.old	2016-09-15 11:40:23.067523309 -0400
+++ plugins/dynamic_simulator/new_sim_file_fumi.cpp	2016-09-15 11:40:55.859504858 -0400
@@ -70,7 +70,7 @@
    
    if (cur_token != G_TOKEN_LEFT_CURLY) {
    	  err("Processing parse configuration: Expected left curly token.");
-      return false;
+      return NULL;
    }
    m_depth++;
    
--- plugins/dynamic_simulator/new_sim_file_inventory.cpp.old	2016-09-15 11:37:11.855734044 -0400
+++ plugins/dynamic_simulator/new_sim_file_inventory.cpp	2016-09-15 11:37:54.293781766 -0400
@@ -71,7 +71,7 @@
    
    if (cur_token != G_TOKEN_LEFT_CURLY) {
    	  err("Processing parse configuration: Expected left curly token.");
-      return false;
+      return NULL;
    }
    m_depth++;
    
--- plugins/dynamic_simulator/new_sim_file_sensor.cpp.old	2016-09-15 11:32:57.280329513 -0400
+++ plugins/dynamic_simulator/new_sim_file_sensor.cpp	2016-09-15 11:33:31.636306516 -0400
@@ -77,7 +77,7 @@
    
    if (cur_token != G_TOKEN_LEFT_CURLY) {
    	  err("Processing parse configuration: Expected left curly token.");
-      return false;
+      return NULL;
    }
    m_depth++;
    
--- plugins/dynamic_simulator/new_sim_file_watchdog.cpp.old	2016-09-15 11:38:28.170251848 -0400
+++ plugins/dynamic_simulator/new_sim_file_watchdog.cpp	2016-09-15 11:40:01.808346385 -0400
@@ -69,7 +69,7 @@
    
    if (cur_token != G_TOKEN_LEFT_CURLY) {
    	  err("Processing parse configuration: Expected left curly token.");
-      return false;
+      return NULL;
    }
    m_depth++;