Fix build on Ubuntu 20.04 (#568)

deadeyegoodwin · web-flow · commit fa742b798206 · 2021-01-05T15:52:50.000-08:00
Remove std::move in return to resolve this build failure:

    [ 66%] Building CXX object CMakeFiles/onnxruntime_providers.dir/workspace/onnxruntime/onnxruntime/core/providers/cpu/activation/activations.cc.o
    /workspace/onnxruntime/cmake/external/onnx-tensorrt/builtin_op_importers.cpp: In function ‘std::vector&lt;nvinfer1::PluginField&gt; onnx2trt::{anonymous}::loadFields(string_map&lt;std::vector&lt;unsigned char&gt; &gt;&amp;, const OnnxAttrs&amp;, const nvinfer1::PluginFieldCollection*)’:
    /workspace/onnxruntime/cmake/external/onnx-tensorrt/builtin_op_importers.cpp:3737:21: error: moving a local object in a return statement prevents copy elision [-Werror=pessimizing-move]
     3737 |     return std::move(fields);
          |            ~~~~~~~~~^~~~~~~~
    /workspace/onnxruntime/cmake/external/onnx-tensorrt/builtin_op_importers.cpp:3737:21: note: remove ‘std::move’ call

Signed-off-by: David Goodwin &lt;davidg@nvidia.com&gt;
diff --git a/builtin_op_importers.cpp b/builtin_op_importers.cpp
@@ -3779,7 +3779,7 @@ std::vector<nvinfer1::PluginField> loadFields(string_map<std::vector<uint8_t>>&
             }
             fields.emplace_back(fieldName.c_str(), data, type, size);
     }
-    return std::move(fields);
+    return fields;
 }
 
 // Any ops that are not supported will attempt to import as plugins.

Original file line number	Diff line number	Diff line change
`@@ -3779,7 +3779,7 @@ std::vector<nvinfer1::PluginField> loadFields(string_map<std::vector<uint8_t>>&`
`3779`	`3779`	`}`
`3780`	`3780`	`fields.emplace_back(fieldName.c_str(), data, type, size);`
`3781`	`3781`	`}`
`3782`		`- return std::move(fields);`
	`3782`	`+ return fields;`
`3783`	`3783`	`}`
`3784`	`3784`
`3785`	`3785`	`// Any ops that are not supported will attempt to import as plugins.`