|
 |
ca8ab9 |
From 0ba7c9423f64a88ceef50318f1a382059484f737 Mon Sep 17 00:00:00 2001
|
|
|
ca8ab9 |
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
|
|
|
ca8ab9 |
Date: Wed, 15 Jan 2020 13:54:45 +0100
|
|
|
ca8ab9 |
Subject: [PATCH] Do not use C++ keyword operator as a function parameter name
|
|
|
ca8ab9 |
MIME-Version: 1.0
|
|
|
ca8ab9 |
Content-Type: text/plain; charset=UTF-8
|
|
|
ca8ab9 |
Content-Transfer-Encoding: 8bit
|
|
|
ca8ab9 |
|
|
|
ca8ab9 |
This fixes SCAP Workbench build.
|
|
|
ca8ab9 |
|
|
|
ca8ab9 |
Addressing:
|
|
|
ca8ab9 |
[ 37%] Building CXX object CMakeFiles/scap-workbench.dir/scap-workbench_autogen/mocs_compilation.cpp.o
|
|
|
ca8ab9 |
In file included from /usr/local/include/openscap/xccdf_policy.h:39,
|
|
|
ca8ab9 |
from /home/jcerny/work/git/scap-workbench/include/TailoringDockWidgets.h:31,
|
|
|
ca8ab9 |
from /home/jcerny/work/git/scap-workbench/build/scap-workbench_autogen/6YEA5652QU/moc_TailoringDockWidgets.cpp:10,
|
|
|
ca8ab9 |
from /home/jcerny/work/git/scap-workbench/build/scap-workbench_autogen/mocs_compilation.cpp:18:
|
|
|
ca8ab9 |
/usr/local/include/openscap/oval_definitions.h:1676:117: error: declaration of ‘operator,’ as parameter
|
|
|
ca8ab9 |
1676 | restriction *oval_variable_possible_restriction_new(oval_operator_t operator, const char *hint);
|
|
|
ca8ab9 |
| ^
|
|
|
ca8ab9 |
|
|
|
ca8ab9 |
Fixes: #1462
|
|
|
ca8ab9 |
---
|
|
|
ca8ab9 |
src/OVAL/public/oval_definitions.h | 2 +-
|
|
|
ca8ab9 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
ca8ab9 |
|
|
|
ca8ab9 |
diff --git a/src/OVAL/public/oval_definitions.h b/src/OVAL/public/oval_definitions.h
|
|
|
ca8ab9 |
index ea9d3aaf8..b5fe77154 100644
|
|
|
ca8ab9 |
--- a/src/OVAL/public/oval_definitions.h
|
|
|
ca8ab9 |
+++ b/src/OVAL/public/oval_definitions.h
|
|
|
ca8ab9 |
@@ -1669,7 +1669,7 @@ OSCAP_API void oval_variable_possible_value_iterator_free(struct oval_variable_p
|
|
|
ca8ab9 |
* @param hint A short description of what the value means or represents.
|
|
|
ca8ab9 |
* @memberof oval_variable_possible_restriction
|
|
|
ca8ab9 |
*/
|
|
|
ca8ab9 |
-OSCAP_API struct oval_variable_possible_restriction *oval_variable_possible_restriction_new(oval_operator_t operator, const char *hint);
|
|
|
ca8ab9 |
+OSCAP_API struct oval_variable_possible_restriction *oval_variable_possible_restriction_new(oval_operator_t, const char *);
|
|
|
ca8ab9 |
|
|
|
ca8ab9 |
|
|
|
ca8ab9 |
/**
|