Fixes for upstream changes. (#20)

Author: fruffy

targets/bmv2/program_info.cpp

@@ -2,7 +2,6 @@
 
 #include "backends/p4tools/modules/p4rtsmith/core/program_info.h"
 #include "control-plane/p4RuntimeSerializer.h"
-#include "ir/ir.h"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -14,6 +13,6 @@ namespace P4Tools::RTSmith::V1Model {
 
 Bmv2V1ModelProgramInfo::Bmv2V1ModelProgramInfo(const CompilerResult &compilerResult)
     : ProgramInfo(compilerResult, P4::P4RuntimeSerializer::get()->generateP4Runtime(
-                                      &compilerResult.getProgram(), "v1model")) {}
+                                      &compilerResult.getProgram(), cstring("v1model"))) {}
 
 }  // namespace P4Tools::RTSmith::V1Model

targets/tofino/program_info.cpp

@@ -2,7 +2,6 @@
 
 #include "backends/p4tools/modules/p4rtsmith/core/program_info.h"
 #include "control-plane/p4RuntimeSerializer.h"
-#include "ir/ir.h"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -14,6 +13,6 @@ namespace P4Tools::RTSmith::Tna {
 
 TofinoTnaProgramInfo::TofinoTnaProgramInfo(const CompilerResult &compilerResult)
     : ProgramInfo(compilerResult, P4::P4RuntimeSerializer::get()->generateP4Runtime(
-                                      &compilerResult.getProgram(), "tna")) {}
+                                      &compilerResult.getProgram(), cstring("tna"))) {}
 
 }  // namespace P4Tools::RTSmith::Tna

test/core/rtsmith_api_test.cpp

@@ -52,8 +52,9 @@ V1Switch(parse(), verifyChecksum(), ingress(), egress(), computeChecksum(), depa
 
 CompilerOptions generateDefaultApiTestCompilerOptions() {
     auto compilerOptions = CompilerOptions();
-    compilerOptions.target = "bmv2";
-    compilerOptions.arch = "v1model";
+    // TODO: Remove the cstring copy.
+    compilerOptions.target = cstring("bmv2");
+    compilerOptions.arch = cstring("v1model");
     return compilerOptions;
 }