From fba4e4c873a7eab2295359e20bdfc19a8aa8a4ad Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Sun, 19 Jul 2015 14:48:47 +0100
Subject: [PATCH] * Fixing linux failure on dynamic load of the library
---
NPLib/AnnularS1/TAnnularS1Physics.cxx | 6 +++---
NPLib/AnnularS2/TS2Physics.cxx | 6 +++---
NPLib/CATS/TCATSPhysics.cxx | 6 +++---
NPLib/Charissa/TCharissaPhysics.cxx | 6 +++---
NPLib/ChateauCristal/TChateauCristalPhysics.cxx | 6 +++---
NPLib/Chio/TChio_anPhysics.cxx | 6 +++---
NPLib/Chio/TChio_digPhysics.cxx | 6 +++---
NPLib/ComptonTelescope/TComptonTelescopePhysics.cxx | 6 +++---
NPLib/CsI/TCsIPhysics.cxx | 6 +++---
NPLib/EXL/TExlPhysics.cxx | 6 +++---
NPLib/Exogam/TExogamPhysics.cxx | 6 +++---
NPLib/Fatima/TFatimaPhysics.cxx | 6 +++---
NPLib/GASPARD/GaspardTracker.cxx | 6 +++---
NPLib/HYDE2/THyde2TrackerPhysics.cxx | 6 +++---
NPLib/Helios/THeliosPhysics.cxx | 6 +++---
NPLib/Hira/THiraPhysics.cxx | 6 +++---
NPLib/LaBr3/TLaBr3Physics.cxx | 6 +++---
NPLib/MUST2/TMust2Physics.cxx | 6 +++---
NPLib/Nana/TNanaPhysics.cxx | 6 +++---
NPLib/Paris/TParisPhysics.cxx | 6 +++---
NPLib/Plastic/TPlasticPhysics.cxx | 6 +++---
NPLib/SSSD/TSSSDPhysics.cxx | 6 +++---
NPLib/SiLi/TSiLiPhysics.cxx | 6 +++---
NPLib/SiRes/TSiResPhysics.cxx | 6 +++---
NPLib/Speg/TSpegPhysics.cxx | 6 +++---
NPLib/Tiara/TTiaraHyballPhysics.cxx | 6 +++---
NPLib/W1/TW1Physics.cxx | 6 +++---
27 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/NPLib/AnnularS1/TAnnularS1Physics.cxx b/NPLib/AnnularS1/TAnnularS1Physics.cxx
index 89cb95f2d..a6bcd7bff 100644
--- a/NPLib/AnnularS1/TAnnularS1Physics.cxx
+++ b/NPLib/AnnularS1/TAnnularS1Physics.cxx
@@ -614,14 +614,14 @@ NPL::VDetector* TAnnularS1Physics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_annulars1{
public:
- proxy(){
+ proxy_annulars1(){
NPL::DetectorFactory::getInstance()->AddToken("AnnularS1","AnnularS1");
NPL::DetectorFactory::getInstance()->AddDetector("AnnularS1",TAnnularS1Physics::Construct);
}
};
-proxy p;
+proxy_annulars1 p;
}
diff --git a/NPLib/AnnularS2/TS2Physics.cxx b/NPLib/AnnularS2/TS2Physics.cxx
index c8345f91a..052b79128 100644
--- a/NPLib/AnnularS2/TS2Physics.cxx
+++ b/NPLib/AnnularS2/TS2Physics.cxx
@@ -1181,14 +1181,14 @@ NPL::VDetector* TS2Physics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_annulars2{
public:
- proxy(){
+ proxy_annulars2(){
NPL::DetectorFactory::getInstance()->AddToken("AnnularS2","AnnularS2");
NPL::DetectorFactory::getInstance()->AddDetector("AnnularS2",TS2Physics::Construct);
}
};
-proxy p;
+proxy_annulars2 p;
}
diff --git a/NPLib/CATS/TCATSPhysics.cxx b/NPLib/CATS/TCATSPhysics.cxx
index b862f50d5..f8e2c3411 100644
--- a/NPLib/CATS/TCATSPhysics.cxx
+++ b/NPLib/CATS/TCATSPhysics.cxx
@@ -1006,14 +1006,14 @@ NPL::VDetector* TCATSPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_cats{
public:
- proxy(){
+ proxy_cats(){
NPL::DetectorFactory::getInstance()->AddToken("CATSDetector","CATS");
NPL::DetectorFactory::getInstance()->AddDetector("CATSDetector",TCATSPhysics::Construct);
}
};
-proxy p;
+proxy_cats p;
}
diff --git a/NPLib/Charissa/TCharissaPhysics.cxx b/NPLib/Charissa/TCharissaPhysics.cxx
index d07ccd205..bafbf71b5 100644
--- a/NPLib/Charissa/TCharissaPhysics.cxx
+++ b/NPLib/Charissa/TCharissaPhysics.cxx
@@ -1382,14 +1382,14 @@ NPL::VDetector* TCharissaPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_charissa{
public:
- proxy(){
+ proxy_charissa(){
NPL::DetectorFactory::getInstance()->AddToken("CharissaTelescope","Charissa");
NPL::DetectorFactory::getInstance()->AddDetector("CharissaTelescope",TCharissaPhysics::Construct);
}
};
-proxy p;
+proxy_charissa p;
}
diff --git a/NPLib/ChateauCristal/TChateauCristalPhysics.cxx b/NPLib/ChateauCristal/TChateauCristalPhysics.cxx
index 87db643b8..01100d5bc 100644
--- a/NPLib/ChateauCristal/TChateauCristalPhysics.cxx
+++ b/NPLib/ChateauCristal/TChateauCristalPhysics.cxx
@@ -515,14 +515,14 @@ NPL::VDetector* TChateauCristalPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_chateaucristal{
public:
- proxy(){
+ proxy_chateaucristal(){
NPL::DetectorFactory::getInstance()->AddToken("ChateauCristal","ChateauCristal");
NPL::DetectorFactory::getInstance()->AddDetector("ChateauCristal",TChateauCristalPhysics::Construct);
}
};
-proxy p;
+proxy_chateaucristal p;
}
diff --git a/NPLib/Chio/TChio_anPhysics.cxx b/NPLib/Chio/TChio_anPhysics.cxx
index d17bca05a..dac235384 100644
--- a/NPLib/Chio/TChio_anPhysics.cxx
+++ b/NPLib/Chio/TChio_anPhysics.cxx
@@ -422,15 +422,15 @@ NPL::VDetector* TChio_anPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class anproxy{
+class proxy_chioan{
public:
- anproxy(){
+ proxy_chioan(){
NPL::DetectorFactory::getInstance()->AddToken("IonisationChamber","Chio");
NPL::DetectorFactory::getInstance()->AddDetector("IonisationChamber",TChio_anPhysics::Construct);
}
};
-anproxy anp ;
+proxy_chioan anp ;
}
diff --git a/NPLib/Chio/TChio_digPhysics.cxx b/NPLib/Chio/TChio_digPhysics.cxx
index 803f7d147..9ea48645b 100644
--- a/NPLib/Chio/TChio_digPhysics.cxx
+++ b/NPLib/Chio/TChio_digPhysics.cxx
@@ -438,14 +438,14 @@ NPL::VDetector* TChio_digPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_chiodig{
public:
- proxy(){
+ proxy_chiodig(){
NPL::DetectorFactory::getInstance()->AddToken("Chio","Chio");
NPL::DetectorFactory::getInstance()->AddDetector("Chio",TChio_digPhysics::Construct);
}
};
-proxy p;
+proxy_chiodig p;
}
diff --git a/NPLib/ComptonTelescope/TComptonTelescopePhysics.cxx b/NPLib/ComptonTelescope/TComptonTelescopePhysics.cxx
index 64e7e77a2..110d5bc43 100644
--- a/NPLib/ComptonTelescope/TComptonTelescopePhysics.cxx
+++ b/NPLib/ComptonTelescope/TComptonTelescopePhysics.cxx
@@ -750,14 +750,14 @@ NPL::VDetector* TComptonTelescopePhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_comptontelescope{
public:
- proxy(){
+ proxy_comptontelescope(){
NPL::DetectorFactory::getInstance()->AddToken("ComptonTelescope","ComptonTelescope");
NPL::DetectorFactory::getInstance()->AddDetector("ComptonTelescope",TComptonTelescopePhysics::Construct);
}
};
-proxy p;
+proxy_comptontelescope p;
}
diff --git a/NPLib/CsI/TCsIPhysics.cxx b/NPLib/CsI/TCsIPhysics.cxx
index f528d1cfd..46e67f8a9 100644
--- a/NPLib/CsI/TCsIPhysics.cxx
+++ b/NPLib/CsI/TCsIPhysics.cxx
@@ -309,14 +309,14 @@ NPL::VDetector* TCsIPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
- class proxy{
+ class proxy_csi{
public:
- proxy(){
+ proxy_csi(){
NPL::DetectorFactory::getInstance()->AddToken("CsI","CsI");
NPL::DetectorFactory::getInstance()->AddDetector("CsI",TCsIPhysics::Construct);
}
};
- proxy p;
+ proxy_csi p;
}
diff --git a/NPLib/EXL/TExlPhysics.cxx b/NPLib/EXL/TExlPhysics.cxx
index 26cba51aa..df4620ecc 100644
--- a/NPLib/EXL/TExlPhysics.cxx
+++ b/NPLib/EXL/TExlPhysics.cxx
@@ -315,14 +315,14 @@ NPL::VDetector* TExlPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_exl{
public:
- proxy(){
+ proxy_exl(){
NPL::DetectorFactory::getInstance()->AddToken("EXL","Exl");
NPL::DetectorFactory::getInstance()->AddDetector("EXL",TExlPhysics::Construct);
}
};
-proxy p;
+proxy_exl p;
}
diff --git a/NPLib/Exogam/TExogamPhysics.cxx b/NPLib/Exogam/TExogamPhysics.cxx
index dbdb5a8e9..b2078ad9e 100644
--- a/NPLib/Exogam/TExogamPhysics.cxx
+++ b/NPLib/Exogam/TExogamPhysics.cxx
@@ -739,14 +739,14 @@ NPL::VDetector* TExogamPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_exogam{
public:
- proxy(){
+ proxy_exogam(){
NPL::DetectorFactory::getInstance()->AddToken("EXOGAMArray","Exogam");
NPL::DetectorFactory::getInstance()->AddDetector("EXOGAMArray",TExogamPhysics::Construct);
}
};
-proxy p;
+proxy_exogam p;
}
diff --git a/NPLib/Fatima/TFatimaPhysics.cxx b/NPLib/Fatima/TFatimaPhysics.cxx
index 89c057a3b..e3326f98a 100644
--- a/NPLib/Fatima/TFatimaPhysics.cxx
+++ b/NPLib/Fatima/TFatimaPhysics.cxx
@@ -577,14 +577,14 @@ NPL::VDetector* TFatimaPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_fatima{
public:
- proxy(){
+ proxy_fatima(){
NPL::DetectorFactory::getInstance()->AddToken("Fatima","Fatima");
NPL::DetectorFactory::getInstance()->AddDetector("Fatima",TFatimaPhysics::Construct);
}
};
-proxy p;
+proxy_fatima p;
}
diff --git a/NPLib/GASPARD/GaspardTracker.cxx b/NPLib/GASPARD/GaspardTracker.cxx
index 824666629..5f7d84cd9 100644
--- a/NPLib/GASPARD/GaspardTracker.cxx
+++ b/NPLib/GASPARD/GaspardTracker.cxx
@@ -329,15 +329,15 @@ NPL::VDetector* GaspardTracker::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_gaspard{
public:
- proxy(){
+ proxy_gaspard(){
NPL::DetectorFactory::getInstance()->AddToken("GaspardTracker","GASPARD");
NPL::DetectorFactory::getInstance()->AddDetector("GaspardTracker",GaspardTracker::Construct);
}
};
-proxy p;
+proxy_gaspard p;
}
diff --git a/NPLib/HYDE2/THyde2TrackerPhysics.cxx b/NPLib/HYDE2/THyde2TrackerPhysics.cxx
index a02c4da1c..a7e72e29a 100644
--- a/NPLib/HYDE2/THyde2TrackerPhysics.cxx
+++ b/NPLib/HYDE2/THyde2TrackerPhysics.cxx
@@ -79,14 +79,14 @@ NPL::VDetector* THyde2TrackerPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_hyde2{
public:
- proxy(){
+ proxy_hyde2(){
NPL::DetectorFactory::getInstance()->AddToken("Hyde2Tracker","Hyde2Tracker");
NPL::DetectorFactory::getInstance()->AddDetector("Hyde2Tracker",THyde2TrackerPhysics::Construct);
}
};
-proxy p;
+proxy_hyde2 p;
}
diff --git a/NPLib/Helios/THeliosPhysics.cxx b/NPLib/Helios/THeliosPhysics.cxx
index 2eaa8eb06..6f03343df 100644
--- a/NPLib/Helios/THeliosPhysics.cxx
+++ b/NPLib/Helios/THeliosPhysics.cxx
@@ -180,14 +180,14 @@ NPL::VDetector* THeliosPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_helios{
public:
- proxy(){
+ proxy_helios(){
NPL::DetectorFactory::getInstance()->AddToken("Helios","Helios");
NPL::DetectorFactory::getInstance()->AddDetector("Helios",THeliosPhysics::Construct);
}
};
-proxy p;
+proxy_helios p;
}
diff --git a/NPLib/Hira/THiraPhysics.cxx b/NPLib/Hira/THiraPhysics.cxx
index 8e334cbd1..ba0901551 100644
--- a/NPLib/Hira/THiraPhysics.cxx
+++ b/NPLib/Hira/THiraPhysics.cxx
@@ -481,14 +481,14 @@ NPL::VDetector* THiraPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
- class proxy{
+ class proxy_hira{
public:
- proxy(){
+ proxy_hira(){
NPL::DetectorFactory::getInstance()->AddToken("HIRAArray","Hira");
NPL::DetectorFactory::getInstance()->AddDetector("HIRAArray",THiraPhysics::Construct);
}
};
- proxy p;
+ proxy_hira p;
}
diff --git a/NPLib/LaBr3/TLaBr3Physics.cxx b/NPLib/LaBr3/TLaBr3Physics.cxx
index c795054f2..153b9b016 100644
--- a/NPLib/LaBr3/TLaBr3Physics.cxx
+++ b/NPLib/LaBr3/TLaBr3Physics.cxx
@@ -348,14 +348,14 @@ NPL::VDetector* TLaBr3Physics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_labr3{
public:
- proxy(){
+ proxy_labr3(){
NPL::DetectorFactory::getInstance()->AddToken("LaBr3","LaBr3");
NPL::DetectorFactory::getInstance()->AddDetector("LaBr3",TLaBr3Physics::Construct);
}
};
-proxy p;
+proxy_labr3 p;
}
diff --git a/NPLib/MUST2/TMust2Physics.cxx b/NPLib/MUST2/TMust2Physics.cxx
index a52eef92f..558f3b94b 100644
--- a/NPLib/MUST2/TMust2Physics.cxx
+++ b/NPLib/MUST2/TMust2Physics.cxx
@@ -1437,14 +1437,14 @@ NPL::VDetector* TMust2Physics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_must2{
public:
- proxy(){
+ proxy_must2(){
NPL::DetectorFactory::getInstance()->AddToken("MUST2Array","MUST2");
NPL::DetectorFactory::getInstance()->AddDetector("MUST2Array",TMust2Physics::Construct);
}
};
-proxy p;
+proxy_must2 p;
}
diff --git a/NPLib/Nana/TNanaPhysics.cxx b/NPLib/Nana/TNanaPhysics.cxx
index b719d974d..32a9f059e 100644
--- a/NPLib/Nana/TNanaPhysics.cxx
+++ b/NPLib/Nana/TNanaPhysics.cxx
@@ -578,14 +578,14 @@ NPL::VDetector* TNanaPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_nana{
public:
- proxy(){
+ proxy_nana(){
NPL::DetectorFactory::getInstance()->AddToken("Nana","Nana");
NPL::DetectorFactory::getInstance()->AddDetector("Nana",TNanaPhysics::Construct);
}
};
-proxy p;
+proxy_nana p;
}
diff --git a/NPLib/Paris/TParisPhysics.cxx b/NPLib/Paris/TParisPhysics.cxx
index 07fc86e29..505230e04 100644
--- a/NPLib/Paris/TParisPhysics.cxx
+++ b/NPLib/Paris/TParisPhysics.cxx
@@ -945,14 +945,14 @@ NPL::VDetector* TParisPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_paris{
public:
- proxy(){
+ proxy_paris(){
NPL::DetectorFactory::getInstance()->AddToken("Paris","Paris");
NPL::DetectorFactory::getInstance()->AddDetector("Paris",TParisPhysics::Construct);
}
};
-proxy p;
+proxy_paris p;
}
diff --git a/NPLib/Plastic/TPlasticPhysics.cxx b/NPLib/Plastic/TPlasticPhysics.cxx
index bae84998d..ae0e18f7c 100644
--- a/NPLib/Plastic/TPlasticPhysics.cxx
+++ b/NPLib/Plastic/TPlasticPhysics.cxx
@@ -308,14 +308,14 @@ NPL::VDetector* TPlasticPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_plastic{
public:
- proxy(){
+ proxy_plastic(){
NPL::DetectorFactory::getInstance()->AddToken("Plastic","Plastic");
NPL::DetectorFactory::getInstance()->AddDetector("Plastic",TPlasticPhysics::Construct);
}
};
-proxy p;
+proxy_plastic p;
}
diff --git a/NPLib/SSSD/TSSSDPhysics.cxx b/NPLib/SSSD/TSSSDPhysics.cxx
index 8e1df5339..4614deb32 100644
--- a/NPLib/SSSD/TSSSDPhysics.cxx
+++ b/NPLib/SSSD/TSSSDPhysics.cxx
@@ -436,14 +436,14 @@ NPL::VDetector* TSSSDPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_sssd{
public:
- proxy(){
+ proxy_sssd(){
NPL::DetectorFactory::getInstance()->AddToken("SSSD","SSSD");
NPL::DetectorFactory::getInstance()->AddDetector("SSSD",TSSSDPhysics::Construct);
}
};
-proxy p;
+proxy_sssd p;
}
diff --git a/NPLib/SiLi/TSiLiPhysics.cxx b/NPLib/SiLi/TSiLiPhysics.cxx
index 8bd2a09cc..8b7f9bd35 100644
--- a/NPLib/SiLi/TSiLiPhysics.cxx
+++ b/NPLib/SiLi/TSiLiPhysics.cxx
@@ -331,14 +331,14 @@ NPL::VDetector* TSiLiPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_sili{
public:
- proxy(){
+ proxy_sili(){
NPL::DetectorFactory::getInstance()->AddToken("SiLi","SiLi");
NPL::DetectorFactory::getInstance()->AddDetector("SiLi",TSiLiPhysics::Construct);
}
};
-proxy p;
+proxy_sili p;
}
diff --git a/NPLib/SiRes/TSiResPhysics.cxx b/NPLib/SiRes/TSiResPhysics.cxx
index d38d766f5..ff97f85fc 100644
--- a/NPLib/SiRes/TSiResPhysics.cxx
+++ b/NPLib/SiRes/TSiResPhysics.cxx
@@ -358,14 +358,14 @@ NPL::VDetector* TSiResPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_sires{
public:
- proxy(){
+ proxy_sires(){
NPL::DetectorFactory::getInstance()->AddToken("SiRes","SiRes");
NPL::DetectorFactory::getInstance()->AddDetector("SiRes",TSiResPhysics::Construct);
}
};
-proxy p;
+proxy_sires p;
}
diff --git a/NPLib/Speg/TSpegPhysics.cxx b/NPLib/Speg/TSpegPhysics.cxx
index ab55e1d0d..ee3e3b378 100644
--- a/NPLib/Speg/TSpegPhysics.cxx
+++ b/NPLib/Speg/TSpegPhysics.cxx
@@ -1705,14 +1705,14 @@ NPL::VDetector* TSpegPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_speg{
public:
- proxy(){
+ proxy_speg(){
NPL::DetectorFactory::getInstance()->AddToken("Speg","Speg");
NPL::DetectorFactory::getInstance()->AddDetector("Speg",TSpegPhysics::Construct);
}
};
-proxy p;
+proxy_speg p;
}
diff --git a/NPLib/Tiara/TTiaraHyballPhysics.cxx b/NPLib/Tiara/TTiaraHyballPhysics.cxx
index 34319d5e0..11a4196b0 100644
--- a/NPLib/Tiara/TTiaraHyballPhysics.cxx
+++ b/NPLib/Tiara/TTiaraHyballPhysics.cxx
@@ -789,14 +789,14 @@ NPL::VDetector* TTiaraHyballPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_hyball{
public:
- proxy(){
+ proxy_hyball(){
NPL::DetectorFactory::getInstance()->AddToken("Tiara","Tiara");
NPL::DetectorFactory::getInstance()->AddDetector("TiaraHyballWedge",TTiaraHyballPhysics::Construct);
}
};
-proxy p;
+proxy_hyball p;
}
diff --git a/NPLib/W1/TW1Physics.cxx b/NPLib/W1/TW1Physics.cxx
index de84a37a6..d2bad968e 100644
--- a/NPLib/W1/TW1Physics.cxx
+++ b/NPLib/W1/TW1Physics.cxx
@@ -871,14 +871,14 @@ NPL::VDetector* TW1Physics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_w1{
public:
- proxy(){
+ proxy_w1(){
NPL::DetectorFactory::getInstance()->AddToken("W1","W1");
NPL::DetectorFactory::getInstance()->AddDetector("W1",TW1Physics::Construct);
}
};
-proxy p;
+proxy_w1 p;
}
--
GitLab