Move CPUServiceBase to FWCore/AbstractServices

Author: makortel

…ore/Utilities/interface/CPUServiceBase.h …tractServices/interface/CPUServiceBase.hFWCore/Utilities/interface/CPUServiceBase.h renamed to FWCore/AbstractServices/interface/CPUServiceBase.h FWCore/Utilities/interface/CPUServiceBase.h renamed to FWCore/AbstractServices/interface/CPUServiceBase.h

@@ -1,8 +1,8 @@
-#ifndef FWCore_Utilities_CPUServiceBase_h
-#define FWCore_Utilities_CPUServiceBase_h
+#ifndef FWCore_AbstractServices_interface_CPUServiceBase_h
+#define FWCore_AbstractServices_interface_CPUServiceBase_h
 // -*- C++ -*-
 //
-// Package:     FWCore/Utilities
+// Package:     FWCore/AbstractServices
 // Class  :     CPUServiceBase
 //
 /**\class edm::CPUServiceBase
@@ -23,8 +23,10 @@ namespace edm {
   class CPUServiceBase {
   public:
     CPUServiceBase();
-    CPUServiceBase(const CPUServiceBase &) = delete;                   // stop default
-    const CPUServiceBase &operator=(const CPUServiceBase &) = delete;  // stop default
+    CPUServiceBase(const CPUServiceBase &) = delete;
+    const CPUServiceBase &operator=(const CPUServiceBase &) = delete;
+    CPUServiceBase(CPUServiceBase &&) = delete;
+    const CPUServiceBase &operator=(CPUServiceBase &&) = delete;
 
     virtual ~CPUServiceBase();
   };

FWCore/AbstractServices/src/CPUServiceBase.cc

@@ -0,0 +1,18 @@
+// -*- C++ -*-
+//
+// Package:     FWCore/AbstractServices
+// Class  :     CPUServiceBase
+//
+// Implementation:
+//     Stub class information for CPU service.
+//
+// Original Author:  Brian Bockelman
+//         Created:  Wed Sep  7 12:05:13 CDT 2016
+//
+
+#include "FWCore/AbstractServices/interface/CPUServiceBase.h"
+
+namespace edm {
+  CPUServiceBase::CPUServiceBase() = default;
+  CPUServiceBase::~CPUServiceBase() = default;
+}  // namespace edm

FWCore/Services/plugins/CPU.cc

@@ -8,6 +8,7 @@
 // Original Author:  Natalia Garcia
 // CPU.cc: v 1.0 2009/01/08 11:31:07
 
+#include "FWCore/AbstractServices/interface/CPUServiceBase.h"
 #include "FWCore/AbstractServices/interface/ResourceInformation.h"
 #include "FWCore/MessageLogger/interface/JobReport.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -16,7 +17,6 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-#include "FWCore/Utilities/interface/CPUServiceBase.h"
 
 #include "cpu_features/cpu_features_macros.h"