From: David Marchand <david.marchand@6wind.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 1/2] Revert "eal: fix C++ app build"
Date: Fri, 13 Nov 2015 10:35:25 +0100 [thread overview]
Message-ID: <1447407326-13446-1-git-send-email-david.marchand@6wind.com> (raw)
In-Reply-To: <1435927863-3398-2-git-send-email-joongi@an.kaist.ac.kr>
This reverts commit 621389bbbe0860d41538aeac893b6d74e714530c.
Signed-off-by: David Marchand <david.marchand@6wind.com>
---
lib/librte_eal/common/include/arch/ppc_64/rte_cpuflags.h | 4 ++--
lib/librte_eal/common/include/arch/tile/rte_cpuflags.h | 4 ++--
lib/librte_eal/common/include/arch/x86/rte_cpuflags.h | 4 ++--
lib/librte_eal/common/include/generic/rte_cpuflags.h | 12 ++----------
4 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/lib/librte_eal/common/include/arch/ppc_64/rte_cpuflags.h b/lib/librte_eal/common/include/arch/ppc_64/rte_cpuflags.h
index f1cfc4f..df45047 100644
--- a/lib/librte_eal/common/include/arch/ppc_64/rte_cpuflags.h
+++ b/lib/librte_eal/common/include/arch/ppc_64/rte_cpuflags.h
@@ -49,7 +49,7 @@ extern "C" {
#define AT_HWCAP2 26
/* software based registers */
-enum cpu_register_t __RTE_REGISTER_UNDERLYING_TYPE {
+enum cpu_register_t {
REG_HWCAP = 0,
REG_HWCAP2,
};
@@ -57,7 +57,7 @@ enum cpu_register_t __RTE_REGISTER_UNDERLYING_TYPE {
/**
* Enumeration of all CPU features supported
*/
-enum rte_cpu_flag_t __RTE_CPUFLAG_UNDERLYING_TYPE {
+enum rte_cpu_flag_t {
RTE_CPUFLAG_PPC_LE = 0,
RTE_CPUFLAG_TRUE_LE,
RTE_CPUFLAG_PSERIES_PERFMON_COMPAT,
diff --git a/lib/librte_eal/common/include/arch/tile/rte_cpuflags.h b/lib/librte_eal/common/include/arch/tile/rte_cpuflags.h
index d6696d3..08aa957 100644
--- a/lib/librte_eal/common/include/arch/tile/rte_cpuflags.h
+++ b/lib/librte_eal/common/include/arch/tile/rte_cpuflags.h
@@ -45,14 +45,14 @@ extern "C" {
#include "generic/rte_cpuflags.h"
/* software based registers */
-enum cpu_register_t __RTE_REGISTER_UNDERLYING_TYPE {
+enum cpu_register_t {
REG_DUMMY = 0
};
/**
* Enumeration of all CPU features supported
*/
-enum rte_cpu_flag_t __RTE_CPUFLAG_UNDERLYING_TYPE {
+enum rte_cpu_flag_t {
RTE_CPUFLAG_NUMFLAGS /**< This should always be the last! */
};
diff --git a/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h b/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h
index df1834c..dd56553 100644
--- a/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h
+++ b/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h
@@ -45,7 +45,7 @@ extern "C" {
#include "generic/rte_cpuflags.h"
-enum rte_cpu_flag_t __RTE_CPUFLAG_UNDERLYING_TYPE {
+enum rte_cpu_flag_t {
/* (EAX 01h) ECX features*/
RTE_CPUFLAG_SSE3 = 0, /**< SSE3 */
RTE_CPUFLAG_PCLMULQDQ, /**< PCLMULQDQ */
@@ -150,7 +150,7 @@ enum rte_cpu_flag_t __RTE_CPUFLAG_UNDERLYING_TYPE {
RTE_CPUFLAG_NUMFLAGS, /**< This should always be the last! */
};
-enum cpu_register_t __RTE_REGISTER_UNDERLYING_TYPE {
+enum cpu_register_t {
RTE_REG_EAX = 0,
RTE_REG_EBX,
RTE_REG_ECX,
diff --git a/lib/librte_eal/common/include/generic/rte_cpuflags.h b/lib/librte_eal/common/include/generic/rte_cpuflags.h
index 5352cbc..61c4db1 100644
--- a/lib/librte_eal/common/include/generic/rte_cpuflags.h
+++ b/lib/librte_eal/common/include/generic/rte_cpuflags.h
@@ -44,23 +44,15 @@
#include <errno.h>
#include <stdint.h>
-#ifdef __cplusplus
-#define __RTE_CPUFLAG_UNDERLYING_TYPE : unsigned int
-#define __RTE_REGISTER_UNDERLYING_TYPE : unsigned int
-#else
-#define __RTE_CPUFLAG_UNDERLYING_TYPE
-#define __RTE_REGISTER_UNDERLYING_TYPE
-#endif
-
/**
* Enumeration of all CPU features supported
*/
-enum rte_cpu_flag_t __RTE_CPUFLAG_UNDERLYING_TYPE;
+enum rte_cpu_flag_t;
/**
* Enumeration of CPU registers
*/
-enum cpu_register_t __RTE_REGISTER_UNDERLYING_TYPE;
+enum cpu_register_t;
typedef uint32_t cpuid_registers_t[4];
--
1.9.1
next prev parent reply other threads:[~2015-11-13 9:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-03 12:51 [dpdk-dev] [PATCH 1/2] lib: Fix pointer arithmetic for C++ Joongi Kim
2015-07-03 12:51 ` [dpdk-dev] [PATCH 2/2] eal: Fix compilation on C++ Joongi Kim
2015-08-17 15:29 ` Thomas Monjalon
2015-08-17 15:50 ` Thomas Monjalon
2015-11-13 9:35 ` David Marchand [this message]
2015-11-13 9:35 ` [dpdk-dev] [PATCH 2/2] eal: move empty declarations to doc David Marchand
2015-11-23 15:19 ` Thomas Monjalon
2015-08-17 15:22 ` [dpdk-dev] [PATCH 1/2] lib: Fix pointer arithmetic for C++ Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447407326-13446-1-git-send-email-david.marchand@6wind.com \
--to=david.marchand@6wind.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).