Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove intrusive macros breaking libstdc++ #11954

Merged
merged 1 commit into from
Oct 21, 2015
Merged

Remove intrusive macros breaking libstdc++ #11954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion MagneticField/Engine/test/testMagneticField.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,6 @@ void testMagneticField::fillFromTable(string inputFile, vector<GlobalPoint>& p,
}


#define private public
#include "MagneticField/VolumeBasedEngine/interface/VolumeBasedMagneticField.h"

// Get the pointer of the volume containing a point
Expand Down
17 changes: 6 additions & 11 deletions MagneticField/GeomBuilder/test/stubs/MagGeometryAnalyzer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,22 @@
#include "MagneticField/GeomBuilder/test/stubs/MagGeometryExerciser.h"
#include "MagneticField/Engine/interface/MagneticField.h"
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"

#include "MagneticField/Layers/interface/MagVerbosity.h"

//dirty hack
#define private public
#include "MagneticField/GeomBuilder/src/MagGeoBuilderFromDDD.h"
#include "MagneticField/VolumeBasedEngine/interface/VolumeBasedMagneticField.h"
#undef public

#include <iostream>
#include <vector>

using namespace std;

class MagGeometryAnalyzer : public edm::EDAnalyzer {
class testMagGeometryAnalyzer : public edm::EDAnalyzer {
public:
/// Constructor
MagGeometryAnalyzer(const edm::ParameterSet& pset) {};
testMagGeometryAnalyzer(const edm::ParameterSet& pset) {};

/// Destructor
virtual ~MagGeometryAnalyzer() {};
virtual ~testMagGeometryAnalyzer() {};

/// Perform the real analysis
void analyze(const edm::Event & event, const edm::EventSetup& eventSetup);
Expand All @@ -46,7 +41,7 @@ class MagGeometryAnalyzer : public edm::EDAnalyzer {

using namespace edm;

void MagGeometryAnalyzer::analyze(const edm::Event & event, const edm::EventSetup& eventSetup) {
void testMagGeometryAnalyzer::analyze(const edm::Event & event, const edm::EventSetup& eventSetup) {

ESHandle<MagneticField> magfield;
eventSetup.get<IdealMagneticFieldRecord>().get(magfield);
Expand Down Expand Up @@ -79,7 +74,7 @@ void MagGeometryAnalyzer::analyze(const edm::Event & event, const edm::EventSetu
#include "VolumeGridTester.h"


void MagGeometryAnalyzer::testGrids(const vector<MagVolume6Faces const*>& bvol) {
void testMagGeometryAnalyzer::testGrids(const vector<MagVolume6Faces const*>& bvol) {
static map<string,int> nameCalls;

for (vector<MagVolume6Faces const*>::const_iterator i=bvol.begin();
Expand All @@ -100,4 +95,4 @@ void MagGeometryAnalyzer::testGrids(const vector<MagVolume6Faces const*>& bvol)
}

#include "FWCore/Framework/interface/MakerMacros.h"
DEFINE_FWK_MODULE(MagGeometryAnalyzer);
DEFINE_FWK_MODULE(testMagGeometryAnalyzer);
8 changes: 8 additions & 0 deletions MagneticField/VolumeBasedEngine/interface/VolumeBasedMagneticField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,15 @@
#include "MagneticField/Engine/interface/MagneticField.h"
#include "MagneticField/VolumeBasedEngine/interface/MagGeometry.h"

// Class for testing VolumeBasedMagneticField
class testMagneticField;
class testMagGeometryAnalyzer;

class VolumeBasedMagneticField : public MagneticField {
// For tests
friend class testMagneticField;
friend class testMagGeometryAnalyzer;

public:
// VolumeBasedMagneticField(const DDCompactView & cpv);
VolumeBasedMagneticField( int geomVersion,
Expand Down