From 78bae35b6835626a71c2876c8b5b6238e797f58e Mon Sep 17 00:00:00 2001 From: Daryl Maier Date: Fri, 13 Apr 2018 21:27:28 -0400 Subject: [PATCH] Rename Machine class connector macro The OMR::Machine extensible class connector macros used an old style naming scheme. Remove BASE from each of the macro names for consistency with other extensible classes. Signed-off-by: Daryl Maier --- compiler/arm/codegen/OMRMachine.hpp | 10 ++++------ compiler/codegen/Machine.hpp | 8 ++++---- compiler/codegen/OMRMachine.hpp | 10 +++++----- compiler/p/codegen/OMRMachine.hpp | 8 ++++---- compiler/x/amd64/codegen/OMRMachine.hpp | 8 ++++---- compiler/x/codegen/OMRMachine.hpp | 6 +++--- compiler/x/i386/codegen/OMRMachine.hpp | 6 +++--- compiler/z/codegen/OMRMachine.hpp | 12 ++++++------ 8 files changed, 33 insertions(+), 35 deletions(-) diff --git a/compiler/arm/codegen/OMRMachine.hpp b/compiler/arm/codegen/OMRMachine.hpp index cb9c0e9de26..0d0e1e27438 100644 --- a/compiler/arm/codegen/OMRMachine.hpp +++ b/compiler/arm/codegen/OMRMachine.hpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corp. and others + * Copyright (c) 2000, 2018 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -25,14 +25,12 @@ /* * The following #define and typedef must appear before any #includes in this file */ -#ifndef OMR_MACHINEBASE_CONNECTOR -#define OMR_MACHINEBASE_CONNECTOR - +#ifndef OMR_MACHINE_CONNECTOR +#define OMR_MACHINE_CONNECTOR namespace OMR { namespace ARM { class Machine; } } namespace OMR { typedef OMR::ARM::Machine MachineConnector; } - #else -#error OMR::ARM::Machine expected to be a primary connector, but a OMR connector is already defined +#error OMR::ARM::Machine expected to be a primary connector, but an OMR connector is already defined #endif #include "compiler/codegen/OMRMachine.hpp" diff --git a/compiler/codegen/Machine.hpp b/compiler/codegen/Machine.hpp index 59457576913..fac05e96b14 100644 --- a/compiler/codegen/Machine.hpp +++ b/compiler/codegen/Machine.hpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corp. and others + * Copyright (c) 2000, 2018 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -19,10 +19,10 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception *******************************************************************************/ -#ifndef OMR_MACHINE_INCL -#define OMR_MACHINE_INCL +#ifndef TR_MACHINE_INCL +#define TR_MACHINE_INCL -#include "codegen/OMRMachine.hpp" // for MachineBaseConnector +#include "codegen/OMRMachine.hpp" namespace TR { class CodeGenerator; } diff --git a/compiler/codegen/OMRMachine.hpp b/compiler/codegen/OMRMachine.hpp index e2d55ab6a5e..fc99fddac61 100644 --- a/compiler/codegen/OMRMachine.hpp +++ b/compiler/codegen/OMRMachine.hpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corp. and others + * Copyright (c) 2000, 2018 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -19,14 +19,14 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception *******************************************************************************/ -#ifndef OMR_MACHINE_BASE_INCL -#define OMR_MACHINE_BASE_INCL +#ifndef OMR_MACHINE_INCL +#define OMR_MACHINE_INCL /* * The following #define and typedef must appear before any #includes in this file */ -#ifndef OMR_MACHINEBASE_CONNECTOR -#define OMR_MACHINEBASE_CONNECTOR +#ifndef OMR_MACHINE_CONNECTOR +#define OMR_MACHINE_CONNECTOR namespace OMR { class Machine; } namespace OMR { typedef OMR::Machine MachineConnector; } #endif diff --git a/compiler/p/codegen/OMRMachine.hpp b/compiler/p/codegen/OMRMachine.hpp index 8cc3a5d2d33..87ac13d15e5 100644 --- a/compiler/p/codegen/OMRMachine.hpp +++ b/compiler/p/codegen/OMRMachine.hpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corp. and others + * Copyright (c) 2000, 2018 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -25,12 +25,12 @@ /* * The following #define and typedef must appear before any #includes in this file */ -#ifndef OMR_MACHINEBASE_CONNECTOR -#define OMR_MACHINEBASE_CONNECTOR +#ifndef OMR_MACHINE_CONNECTOR +#define OMR_MACHINE_CONNECTOR namespace OMR { namespace Power { class Machine; } } namespace OMR { typedef OMR::Power::Machine MachineConnector; } #else -#error OMR::Power::Machine expected to be a primary connector, but a OMR connector is already defined +#error OMR::Power::Machine expected to be a primary connector, but an OMR connector is already defined #endif #include "compiler/codegen/OMRMachine.hpp" diff --git a/compiler/x/amd64/codegen/OMRMachine.hpp b/compiler/x/amd64/codegen/OMRMachine.hpp index ed09d4dbf60..f957a145f0b 100644 --- a/compiler/x/amd64/codegen/OMRMachine.hpp +++ b/compiler/x/amd64/codegen/OMRMachine.hpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corp. and others + * Copyright (c) 2000, 2018 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -25,12 +25,12 @@ /* * The following #define and typedef must appear before any #includes in this file */ -#ifndef OMR_MACHINEBASE_CONNECTOR -#define OMR_MACHINEBASE_CONNECTOR +#ifndef OMR_MACHINE_CONNECTOR +#define OMR_MACHINE_CONNECTOR namespace OMR { namespace X86 { namespace AMD64 { class Machine; } } } namespace OMR { typedef OMR::X86::AMD64::Machine MachineConnector; } #else -#error OMR::X86::AMD64::Machine expected to be a primary connector, but a OMR connector is already defined +#error OMR::X86::AMD64::Machine expected to be a primary connector, but an OMR connector is already defined #endif #include "x/codegen/OMRMachine.hpp" diff --git a/compiler/x/codegen/OMRMachine.hpp b/compiler/x/codegen/OMRMachine.hpp index 59ecf41463e..35f9f4b490d 100644 --- a/compiler/x/codegen/OMRMachine.hpp +++ b/compiler/x/codegen/OMRMachine.hpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corp. and others + * Copyright (c) 2000, 2018 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -22,8 +22,8 @@ #ifndef OMR_X86_MACHINE_INCL #define OMR_X86_MACHINE_INCL -#ifndef OMR_MACHINEBASE_CONNECTOR -#define OMR_MACHINEBASE_CONNECTOR +#ifndef OMR_MACHINE_CONNECTOR +#define OMR_MACHINE_CONNECTOR namespace OMR { namespace X86 { class Machine; } } namespace OMR { typedef OMR::X86::Machine MachineConnector; } #endif diff --git a/compiler/x/i386/codegen/OMRMachine.hpp b/compiler/x/i386/codegen/OMRMachine.hpp index 307a97fb6f2..07950a4f4e2 100644 --- a/compiler/x/i386/codegen/OMRMachine.hpp +++ b/compiler/x/i386/codegen/OMRMachine.hpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corp. and others + * Copyright (c) 2000, 2018 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -25,8 +25,8 @@ /* * The following #define and typedef must appear before any #includes in this file */ -#ifndef OMR_MACHINEBASE_CONNECTOR -#define OMR_MACHINEBASE_CONNECTOR +#ifndef OMR_MACHINE_CONNECTOR +#define OMR_MACHINE_CONNECTOR namespace OMR { namespace X86 { namespace I386 { class Machine; } } } namespace OMR { typedef OMR::X86::I386::Machine MachineConnector; } #else diff --git a/compiler/z/codegen/OMRMachine.hpp b/compiler/z/codegen/OMRMachine.hpp index 4f5f276d997..3ecc761873e 100644 --- a/compiler/z/codegen/OMRMachine.hpp +++ b/compiler/z/codegen/OMRMachine.hpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corp. and others + * Copyright (c) 2000, 2018 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -19,17 +19,17 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception *******************************************************************************/ -#ifndef OMR_Z_MACHINEBASE_INCL -#define OMR_Z_MACHINEBASE_INCL +#ifndef OMR_Z_MACHINE_INCL +#define OMR_Z_MACHINE_INCL /* * The following #define and typedef must appear before any #includes in this file */ -#ifndef OMR_MACHINEBASE_CONNECTOR -#define OMR_MACHINEBASE_CONNECTOR +#ifndef OMR_MACHINE_CONNECTOR +#define OMR_MACHINE_CONNECTOR namespace OMR {namespace Z { class Machine; } } namespace OMR { typedef OMR::Z::Machine MachineConnector; } #else -#error OMR::Z::Machine expected to be a primary connector, but a OMR connector is already defined +#error OMR::Z::Machine expected to be a primary connector, but an OMR connector is already defined #endif #include "compiler/codegen/OMRMachine.hpp"