lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 5.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 10:28:22 +02:00
parent fbd4999cf7
commit 4aea781e80
5454 changed files with 223141 additions and 67347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/HepRep/src/G4HepRep.cc
-22
View File
@@ -21,28 +21,6 @@
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
/**
* @author Mark Donszelmann
source/visualization/HepRep/src/G4HepRepFile.cc
+2 -25
View File
@@ -20,31 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4HepRepFile.cc,v 1.6 2002/12/13 11:18:03 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4HepRepFile.cc,v 1.7 2003/06/25 10:19:59 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Joseph Perl 1 October 2001
source/visualization/HepRep/src/G4HepRepFileSceneHandler.cc
+18 -37
View File
@@ -20,31 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4HepRepFileSceneHandler.cc,v 1.11 2003/01/24 21:18:48 perl Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4HepRepFileSceneHandler.cc,v 1.11.2.1.2.2 2003/06/25 10:20:00 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Joseph Perl 27th January 2002
@@ -256,10 +233,10 @@ void G4HepRepFileSceneHandler::AddThis (const G4VTrajectory& traj) {
G4cout << "G4HepRepFileSceneHandler::AddThis(G4VTrajectory&) " << G4endl;
#endif
G4std::vector<G4AttValue>* attValues = traj.CreateAttValues();
G4std::vector<G4AttValue>::iterator iAttVal;
const G4std::map<G4String,G4AttDef>* attDefs = traj.GetAttDefs();
G4std::map<G4String,G4AttDef>::const_iterator iAttDef;
std::vector<G4AttValue>* attValues = traj.CreateAttValues();
std::vector<G4AttValue>::iterator iAttVal;
const std::map<G4String,G4AttDef>* attDefs = traj.GetAttDefs();
std::map<G4String,G4AttDef>::const_iterator iAttDef;
G4int i;
// Open the HepRep output file if it is not already open.
@@ -314,9 +291,9 @@ void G4HepRepFileSceneHandler::AddThis (const G4VTrajectory& traj) {
// different Types.
if (traj.GetPointEntries()>0) {
G4VTrajectoryPoint* aTrajectoryPoint = traj.GetPoint(0);
G4std::vector<G4AttValue>* pointAttValues
std::vector<G4AttValue>* pointAttValues
= aTrajectoryPoint->CreateAttValues();
const G4std::map<G4String,G4AttDef>* pointAttDefs
const std::map<G4String,G4AttDef>* pointAttDefs
= aTrajectoryPoint->GetAttDefs();
if (pointAttValues && pointAttDefs) {
for (iAttVal = pointAttValues->begin();
@@ -357,7 +334,7 @@ void G4HepRepFileSceneHandler::AddThis (const G4VTrajectory& traj) {
if (attValues && attDefs) {
for (iAttVal = attValues->begin();
iAttVal != attValues->end(); ++iAttVal) {
G4std::map<G4String,G4AttDef>::const_iterator iAttDef =
std::map<G4String,G4AttDef>::const_iterator iAttDef =
attDefs->find(iAttVal->GetName());
if (iAttDef == attDefs->end()) {
G4cout << "G4HepRepFileSceneHandler::AddThis(traj):"
@@ -403,16 +380,16 @@ void G4HepRepFileSceneHandler::AddThis (const G4VTrajectory& traj) {
hepRepXMLWriter->addInstance();
// Copy the current trajectory point's G4AttValues to HepRepAttValues.
G4std::vector<G4AttValue>* pointAttValues
std::vector<G4AttValue>* pointAttValues
= aTrajectoryPoint->CreateAttValues();
const G4std::map<G4String,G4AttDef>* pointAttDefs
const std::map<G4String,G4AttDef>* pointAttDefs
= aTrajectoryPoint->GetAttDefs();
if (pointAttValues && pointAttDefs) {
G4std::vector<G4AttValue>::iterator iAttVal;
std::vector<G4AttValue>::iterator iAttVal;
for (iAttVal = pointAttValues->begin();
iAttVal != pointAttValues->end(); ++iAttVal) {
G4std::map<G4String,G4AttDef>::const_iterator iAttDef =
std::map<G4String,G4AttDef>::const_iterator iAttDef =
pointAttDefs->find(iAttVal->GetName());
if (iAttDef == pointAttDefs->end()) {
G4cout << "\nG4VTrajectory::ShowTrajectory:"
@@ -484,7 +461,11 @@ void G4HepRepFileSceneHandler::AddPrimitive (const G4Polymarker& line) {
}
}
#ifdef G4HEPREPFILEDEBUG
void G4HepRepFileSceneHandler::AddPrimitive(const G4Text& text) {
#else
void G4HepRepFileSceneHandler::AddPrimitive(const G4Text&) {
#endif
#ifdef G4HEPREPFILEDEBUG
G4cout <<
"G4HepRepFileSceneHandler::AddPrimitive(const G4Text& text) called:"
@@ -565,7 +546,7 @@ void G4HepRepFileSceneHandler::AddPrimitive(const G4Polyhedron& polyhedron) {
} while (notLastFace);
}
void G4HepRepFileSceneHandler::AddPrimitive(const G4NURBS& nurbs) {
void G4HepRepFileSceneHandler::AddPrimitive(const G4NURBS&) {
#ifdef G4HEPREPFILEDEBUG
G4cout <<
"G4HepRepFileSceneHandler::AddPrimitive(const G4NURBS& nurbs) called."
source/visualization/HepRep/src/G4HepRepFileViewer.cc
+3 -26
View File
@@ -20,36 +20,13 @@
// * statement, and all its terms. *
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4HepRepFileViewer.cc,v 1.8 2002/12/13 11:18:03 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4HepRepFileViewer.cc,v 1.10 2003/06/25 10:20:01 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
#include "G4HepRepFileViewer.hh"
#include "G4ios.hh"
#include "g4std/strstream"
#include <strstream>
#include "G4VSceneHandler.hh"
source/visualization/HepRep/src/G4HepRepSceneHandler.cc
+8 -32
View File
@@ -20,38 +20,14 @@
// * statement, and all its terms. *
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
/**
* @author Mark Donszelmann
*/
#include "globals.hh"
#include "g4std/vector"
#include "g4std/strstream"
#include "g4std/fstream"
#include <vector>
#include <strstream>
#include <fstream>
//HepRep
#include "HEPREP/HepRep.h"
@@ -129,10 +105,10 @@ void G4HepRepSceneHandler::open() {
writer = heprepFactory->createHepRepWriter(&G4cerr);
} else {
char fname [256];
G4std::ostrstream ost(fname, 256);
ost << GetScene()->GetName() << "-" << fileNo++ << ".heprep" << G4std::ends;
std::ostrstream ost(fname, 256);
ost << GetScene()->GetName() << "-" << fileNo++ << ".heprep" << std::ends;
out = new G4std::ofstream(fname);
out = new std::ofstream(fname);
writer = heprepFactory->createHepRepWriter(out);
}
@@ -362,7 +338,7 @@ void G4HepRepSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron) {
}
void G4HepRepSceneHandler::AddPrimitive (const G4Text& text) {
void G4HepRepSceneHandler::AddPrimitive (const G4Text&) {
#ifdef DEBUG
G4cout << "G4HepRepSceneHandler::AddPrimitive(G4Text&) " << G4endl;
#endif
@@ -393,7 +369,7 @@ void G4HepRepSceneHandler::AddPrimitive (const G4Square& square) {
//Method for handling G4NURBS objects for drawing solids.
//Knots and Ctrl Pnts MUST be arrays of GLfloats.
void G4HepRepSceneHandler::AddPrimitive (const G4NURBS& nurb) {
void G4HepRepSceneHandler::AddPrimitive (const G4NURBS&) {
#ifdef DEBUG
G4cout << "G4HepRepSceneHandler::AddPrimitive(G4NURBS&) " << G4endl;
#endif
source/visualization/HepRep/src/G4HepRepViewer.cc
-24
View File
@@ -20,30 +20,6 @@
// * statement, and all its terms. *
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
/**
* @author Mark Donszelmann
*/
source/visualization/HepRep/src/HepRepXMLWriter.cc
+1 -23
View File
@@ -20,31 +20,9 @@
// * statement, and all its terms. *
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//--------------------------------------------------------------------------
// File and Version Information:
// $Id: HepRepXMLWriter.cc,v 1.10 2003/01/24 21:18:48 perl Exp $
// $Id: HepRepXMLWriter.cc,v 1.11 2003/06/25 10:20:07 gunter Exp $
//
// Description:
// Create a HepRep XML File (HepRep version 1).
source/visualization/HepRep/src/IndentPrintWriter.cc
+1 -1
View File
@@ -51,7 +51,7 @@ IndentPrintWriter& IndentPrintWriter::operator<< (const char* s) {
return *this;
}
IndentPrintWriter& IndentPrintWriter::operator<< (ostream& (*pf)(ostream&)) {
IndentPrintWriter& IndentPrintWriter::operator<< (ostream& (*)(ostream&)) {
*out << endl;
indented = false;
return *this;
source/visualization/HepRep/src/StreamerHepRep.cc
+18 -18
View File
@@ -33,7 +33,7 @@ StreamerHepRep::StreamerHepRep(HepRepWriter* streamer) {
StreamerHepRep::~StreamerHepRep() {
}
HepRep* StreamerHepRep::copy(HepRepSelectFilter* filter) {
HepRep* StreamerHepRep::copy(HepRepSelectFilter*) {
return NULL;
}
@@ -46,14 +46,14 @@ bool StreamerHepRep::addLayer(string layer) {
return true;
}
bool StreamerHepRep::addTypeTree(HepRepTypeTree* typeTree) {
bool StreamerHepRep::addTypeTree(HepRepTypeTree*) {
return true;
}
void StreamerHepRep::removeTypeTree(HepRepTypeTree* typeTree) {
void StreamerHepRep::removeTypeTree(HepRepTypeTree*) {
}
HepRepTypeTree* StreamerHepRep::getTypeTree(string name, string version) {
HepRepTypeTree* StreamerHepRep::getTypeTree(string, string) {
return NULL;
}
@@ -61,35 +61,35 @@ vector<HepRepTypeTree*>* StreamerHepRep::getTypeTrees() {
return NULL;
}
HepRepType* StreamerHepRep::getType(string name) {
HepRepType* StreamerHepRep::getType(string) {
return NULL;
}
bool StreamerHepRep::addInstanceTree(HepRepInstanceTree* instanceTree) {
bool StreamerHepRep::addInstanceTree(HepRepInstanceTree*) {
return true;
}
void StreamerHepRep::removeInstanceTree(HepRepInstanceTree* instanceTree) {
void StreamerHepRep::removeInstanceTree(HepRepInstanceTree*) {
}
HepRepInstanceTree* StreamerHepRep::getInstanceTreeTop(string name, string version) {
HepRepInstanceTree* StreamerHepRep::getInstanceTreeTop(string, string) {
return NULL;
}
HepRepInstanceTree* StreamerHepRep::getInstances(string name, string version,
vector<string> typeNames) {
HepRepInstanceTree* StreamerHepRep::getInstances(string, string,
vector<string>) {
return NULL;
}
HepRepInstanceTree* StreamerHepRep::getInstancesAfterAction(
string name,
string version,
vector<string> typeNames,
vector<HepRepAction*> actions,
bool getPoints,
bool getDrawAtts,
bool getNonDrawAtts,
vector<string> invertAtts) {
string,
string,
vector<string>,
vector<HepRepAction*>,
bool,
bool,
bool,
vector<string>) {
return NULL;
}
source/visualization/HepRep/src/StreamerHepRepAttribute.cc
+3 -3
View File
@@ -76,15 +76,15 @@ bool StreamerHepRepAttribute::addAttValue(string key, double red, double green,
return addAttValue(new DefaultHepRepAttValue(key, color, showLabel));
}
HepRepAttValue* StreamerHepRepAttribute::getAttValueFromNode(string lowerCaseName) {
HepRepAttValue* StreamerHepRepAttribute::getAttValueFromNode(string) {
return NULL;
}
HepRepAttValue* StreamerHepRepAttribute::removeAttValue(string key) {
HepRepAttValue* StreamerHepRepAttribute::removeAttValue(string) {
return NULL;
}
HepRepAttValue* StreamerHepRepAttribute::getAttValue(string name) {
HepRepAttValue* StreamerHepRepAttribute::getAttValue(string) {
return NULL;
}
source/visualization/HepRep/src/StreamerHepRepDefinition.cc
+2 -2
View File
@@ -49,11 +49,11 @@ bool StreamerHepRepDefinition::addAttDef(string name, string desc, string type,
return true;
}
HepRepAttDef* StreamerHepRepDefinition::getAttDefFromNode(string lowerCaseName) {
HepRepAttDef* StreamerHepRepDefinition::getAttDefFromNode(string) {
return NULL;
}
HepRepAttDef* StreamerHepRepDefinition::getAttDef(string name) {
HepRepAttDef* StreamerHepRepDefinition::getAttDef(string) {
return NULL;
}
source/visualization/HepRep/src/StreamerHepRepInstance.cc
+6 -6
View File
@@ -45,11 +45,11 @@ StreamerHepRepInstance::StreamerHepRepInstance(HepRepWriter* stream, HepRepInsta
StreamerHepRepInstance::~StreamerHepRepInstance() {
}
HepRepInstance* StreamerHepRepInstance::copy(HepRep* heprep, HepRepInstance* instance, HepRepSelectFilter* filter) {
HepRepInstance* StreamerHepRepInstance::copy(HepRep*, HepRepInstance*, HepRepSelectFilter*) {
return NULL;
}
HepRepInstance* StreamerHepRepInstance::copy(HepRep* heprep, HepRepInstanceTree* instanceTree, HepRepSelectFilter* filter) {
HepRepInstance* StreamerHepRepInstance::copy(HepRep*, HepRepInstanceTree*, HepRepSelectFilter*) {
return NULL;
}
@@ -57,7 +57,7 @@ HepRepType* StreamerHepRepInstance::getType() {
return type;
}
bool StreamerHepRepInstance::addPoint(HepRepPoint* point) {
bool StreamerHepRepInstance::addPoint(HepRepPoint*) {
return true;
}
@@ -65,17 +65,17 @@ vector<HepRepPoint*>* StreamerHepRepInstance::getPoints() {
return NULL;
}
bool StreamerHepRepInstance::addInstance(HepRepInstance* instance) {
bool StreamerHepRepInstance::addInstance(HepRepInstance*) {
return true;
}
void StreamerHepRepInstance::removeInstance(HepRepInstance* instance) {
void StreamerHepRepInstance::removeInstance(HepRepInstance*) {
}
vector<HepRepInstance*>* StreamerHepRepInstance::getInstances() {
return NULL;
}
HepRepAttValue* StreamerHepRepInstance::getAttValue(string name) {
HepRepAttValue* StreamerHepRepInstance::getAttValue(string) {
return NULL;
}
source/visualization/HepRep/src/StreamerHepRepInstanceTree.cc
+3 -3
View File
@@ -39,15 +39,15 @@ HepRepTreeID* StreamerHepRepInstanceTree::copy() {
return DefaultHepRepTreeID::copy();
}
HepRepInstanceTree* StreamerHepRepInstanceTree::copy(HepRep* heprep, HepRepSelectFilter* filter) {
HepRepInstanceTree* StreamerHepRepInstanceTree::copy(HepRep*, HepRepSelectFilter*) {
return NULL;
}
bool StreamerHepRepInstanceTree::addInstance(HepRepInstance* instance) {
bool StreamerHepRepInstanceTree::addInstance(HepRepInstance*) {
return true;
}
void StreamerHepRepInstanceTree::removeInstance(HepRepInstance* instance) {
void StreamerHepRepInstanceTree::removeInstance(HepRepInstance*) {
}
vector<HepRepInstance*>* StreamerHepRepInstanceTree::getInstances() {
source/visualization/HepRep/src/StreamerHepRepPoint.cc
+4 -4
View File
@@ -52,7 +52,7 @@ HepRepAttValue* StreamerHepRepPoint::getAttValue(string lowerCaseName) {
return (value != NULL) ? value : instance->getAttValue(lowerCaseName);
}
HepRepPoint* StreamerHepRepPoint::copy(HepRepInstance* parent) {
HepRepPoint* StreamerHepRepPoint::copy(HepRepInstance*) {
return NULL;
}
@@ -97,15 +97,15 @@ double StreamerHepRepPoint::getEta() {
return -0.5*log((1.-ct)/(1.+ct));
}
double StreamerHepRepPoint::getX(double xVertex, double yVertex, double zVertex) {
double StreamerHepRepPoint::getX(double xVertex, double, double) {
return x - xVertex;
}
double StreamerHepRepPoint::getY(double xVertex, double yVertex, double zVertex) {
double StreamerHepRepPoint::getY(double, double yVertex, double) {
return y - yVertex;
}
double StreamerHepRepPoint::getZ(double xVertex, double yVertex, double zVertex) {
double StreamerHepRepPoint::getZ(double, double, double zVertex) {
return z - zVertex;
}
source/visualization/HepRep/src/StreamerHepRepType.cc
+4 -4
View File
@@ -41,18 +41,18 @@ HepRepType* StreamerHepRepType::getSuperType() {
return parent;
}
HepRepAttDef* StreamerHepRepType::getAttDef(string key) {
HepRepAttDef* StreamerHepRepType::getAttDef(string) {
return NULL;
}
/**
* searched for a value with given name. Search up the type tree if needed.
*/
HepRepAttValue* StreamerHepRepType::getAttValue(string key) {
HepRepAttValue* StreamerHepRepType::getAttValue(string) {
return NULL;
}
HepRepType* StreamerHepRepType::copy(HepRep* heprep, HepRepType* type) {
HepRepType* StreamerHepRepType::copy(HepRep*, HepRepType*) {
return NULL;
}
@@ -76,7 +76,7 @@ void StreamerHepRepType::setInfoURL(string info) {
this->infoURL = info;
}
bool StreamerHepRepType::addType(HepRepType* type) {
bool StreamerHepRepType::addType(HepRepType*) {
return true;
}
source/visualization/HepRep/src/StreamerHepRepTypeTree.cc
+2 -2
View File
@@ -41,11 +41,11 @@ HepRepTreeID* StreamerHepRepTypeTree::copy() {
return DefaultHepRepTreeID::copy();
}
HepRepTypeTree* StreamerHepRepTypeTree::copy(HepRep* heprep) {
HepRepTypeTree* StreamerHepRepTypeTree::copy(HepRep*) {
return NULL;
}
bool StreamerHepRepTypeTree::addType(HepRepType* type) {
bool StreamerHepRepTypeTree::addType(HepRepType*) {
return true;
}
source/visualization/HepRep/src/XMLHepRepStreamer.cc
+2 -2
View File
@@ -193,11 +193,11 @@ bool XMLHepRepStreamer::write(HepRepPoint* point) {
return true;
}
bool XMLHepRepStreamer::write(HepRepAttribute* attribute) {
bool XMLHepRepStreamer::write(HepRepAttribute*) {
return true;
}
bool XMLHepRepStreamer::write(HepRepDefinition* definition) {
bool XMLHepRepStreamer::write(HepRepDefinition*) {
return true;
}
source/visualization/HepRep/src/XMLWriter.cc
+3 -3
View File
@@ -27,7 +27,7 @@
using namespace std;
XMLWriter::XMLWriter(ostream* out, string indentString, string defaultNameSpace)
XMLWriter::XMLWriter(ostream* out, string, string defaultNameSpace)
: defaultNameSpace(defaultNameSpace) {
writer = new IndentPrintWriter(out);
writer->setIndentString(" ");
@@ -94,7 +94,7 @@ void XMLWriter::closeDoc() {
}
void XMLWriter::printComment(string comment) {
if (comment.find("--") >= 0) {
if (comment.find("--") != string::npos) {
cerr << "XMLWriter::printComment '--' sequence not allowed in comment" << endl;
}
*writer << "<!--" << normalizeText(comment).c_str() << "-->" << endl;
@@ -279,7 +279,7 @@ string XMLWriter::normalizeText(string s) {
return str;
}
void XMLWriter::checkNameValid(string s) {
void XMLWriter::checkNameValid(string) {
// Could be added.
// if (!XMLCharacterProperties.validName(s)) throw new RuntimeException("Invalid name: "+s);
}