Commit 8ed067c1 authored by Janek Kozicki's avatar Janek Kozicki

changed guards to #pragma once

no more wondering why it doesn't work, due to not replacing the #ifndef SOMETHING_HPP #define #endif with SOMETHING_ELSE_HPP
parent 3a0a65bc
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef BROADINTERACTOR_HPP
#define BROADINTERACTOR_HPP
#pragma once
#include <yade/core/BoundingVolume.hpp>
#include "StandAloneEngine.hpp"
......@@ -28,4 +27,3 @@ class BroadInteractor : public StandAloneEngine
REGISTER_SERIALIZABLE(BroadInteractor);
#endif // BROADINTERACTOR_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef DATARECORDER_HPP
#define DATARECORDER_HPP
#pragma once
#include "StandAloneEngine.hpp"
......@@ -23,4 +22,3 @@ class DataRecorder : public StandAloneEngine
REGISTER_SERIALIZABLE(DataRecorder);
#endif // DATARECORDER_HPP
......@@ -8,8 +8,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef PHYSICALACTIONVECTORVECTOR_HPP
#define PHYSICALACTIONVECTORVECTOR_HPP
#pragma once
#include<yade/core/PhysicalActionContainer.hpp>
#include<list>
......@@ -87,5 +86,4 @@ class PhysicalActionVectorVector : public PhysicalActionContainer
REGISTER_SERIALIZABLE(PhysicalActionVectorVector);
#endif // __ACTION_VEC_VEC_HPP__
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef KINEMATICENGINE_HPP
#define KINEMATICENGINE_HPP
#pragma once
#include <vector>
......@@ -37,5 +36,4 @@ class DeusExMachina : public Engine
REGISTER_SERIALIZABLE(DeusExMachina);
#endif // __KINEMATICENGINE_H__
......@@ -8,8 +8,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef ENGINE_HPP
#define ENGINE_HPP
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
#include "Omega.hpp"
......@@ -34,6 +33,5 @@ class Engine : public Serializable
REGISTER_SERIALIZABLE(Engine);
#endif // ENGINE_HPP
......@@ -8,8 +8,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef ENGINEUNIT_HPP
#define ENGINEUNIT_HPP
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
......@@ -22,5 +21,4 @@ class EngineUnit : public Serializable
REGISTER_SERIALIZABLE(EngineUnit);
#endif // ENGINEUNIT_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef ENGINEUNIT1D_HPP
#define ENGINEUNIT1D_HPP
#pragma once
#include "EngineUnit.hpp"
......@@ -29,5 +28,4 @@ class EngineUnit1D : public EngineUnit,
REGISTER_CLASS_AND_BASE(EngineUnit1D,EngineUnit FunctorWrapper);
};
#endif // ENGINEUNIT1D_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef ENGINEUNIT2D_HPP
#define ENGINEUNIT2D_HPP
#pragma once
#include "EngineUnit.hpp"
......@@ -31,5 +30,4 @@ class EngineUnit2D : public EngineUnit,
REGISTER_CLASS_AND_BASE(EngineUnit2D,EngineUnit FunctorWrapper);
};
#endif // ENGINEUNIT2D_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef FILEGENERATOR_HPP
#define FILEGENERATOR_HPP
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib-base/Logging.hpp>
......@@ -51,5 +50,4 @@ class FileGenerator
REGISTER_SERIALIZABLE(FileGenerator);
#endif // FILEGENERATOR_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef FRONTEND_HPP
#define FRONTEND_HPP
#pragma once
#include "Omega.hpp"
......@@ -27,5 +26,4 @@ class FrontEnd : public Factorable
REGISTER_FACTORABLE(FrontEnd);
#endif // FRONTEND_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef GEOMETRICALMODEL_HPP
#define GEOMETRICALMODEL_HPP
#pragma once
#include<yade/lib-base/yadeWm3Extra.hpp>
#include <Wm3Vector3.h>
......@@ -35,5 +34,4 @@ class GeometricalModel : public Serializable, public Indexable
REGISTER_SERIALIZABLE(GeometricalModel);
#endif // GEOMETRICALMODEL_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef GROUP_RELATION_DATA_HPP
#define GROUP_RELATION_DATA_HPP
#pragma once
#include <iostream>
#include <string>
......@@ -134,4 +133,3 @@ public:
};
#endif // GROUP_RELATION_DATA_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef INTERACTING_GEOMETRY_HPP
#define INTERACTING_GEOMETRY_HPP
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
#include<yade/lib-multimethods/Indexable.hpp>
......@@ -38,5 +37,4 @@ class InteractingGeometry : public Serializable, public Indexable
REGISTER_SERIALIZABLE(InteractingGeometry);
#endif // INTERACTING_GEOMETRY_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef INTERACTIONGEOMETRY_HPP
#define INTERACTIONGEOMETRY_HPP
#pragma once
#include<yade/lib-base/yadeWm3Extra.hpp>
#include<yade/lib-serialization/Serializable.hpp>
......@@ -22,5 +21,4 @@ class InteractionGeometry : public Serializable, public Indexable
REGISTER_SERIALIZABLE(InteractionGeometry);
#endif // INTERACTIONGEOMETRY_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef INTERACTIONPHYSICS_HPP
#define INTERACTIONPHYSICS_HPP
#pragma once
#include<yade/lib-base/yadeWm3Extra.hpp>
#include<yade/lib-serialization/Serializable.hpp>
......@@ -23,5 +22,4 @@ class InteractionPhysics : public Serializable, public Indexable
REGISTER_SERIALIZABLE(InteractionPhysics);
#endif // INTERACTIONPHYSICS_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef INTERACTIONSOLVER_HPP
#define INTERACTIONSOLVER_HPP
#pragma once
#include "StandAloneEngine.hpp"
......@@ -23,4 +22,3 @@ class InteractionSolver : public StandAloneEngine
REGISTER_SERIALIZABLE(InteractionSolver);
#endif // INTERACTIONSOLVER_HPP
......@@ -8,8 +8,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef METABODY_HPP
#define METABODY_HPP
#pragma once
#include"Body.hpp"
#include"BodyContainer.hpp"
......@@ -71,5 +70,4 @@ class MetaBody : public Body
REGISTER_SERIALIZABLE(MetaBody);
#endif // METABODY_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef METADISPATCHINGENGINE_HPP
#define METADISPATCHINGENGINE_HPP
#pragma once
#include "Engine.hpp"
#include "EngineUnit.hpp"
......@@ -54,5 +53,4 @@ class MetaEngine : public Engine
REGISTER_SERIALIZABLE(MetaEngine);
#endif // METADISPATCHINGENGINE_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef METADISPATCHINGENGINE1D_HPP
#define METADISPATCHINGENGINE1D_HPP
#pragma once
#include "MetaEngine.hpp"
#include<yade/lib-multimethods/DynLibDispatcher.hpp>
......@@ -93,5 +92,4 @@ class MetaEngine1D : public MetaEngine,
REGISTER_CLASS_AND_BASE(MetaEngine1D,MetaEngine DynLibDispatcher);
};
#endif // METADISPATCHINGENGINE1D_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef METADISPATCHINGENGINE2D_HPP
#define METADISPATCHINGENGINE2D_HPP
#pragma once
#include "MetaEngine.hpp"
#include<yade/lib-multimethods/DynLibDispatcher.hpp>
......@@ -119,5 +118,4 @@ class MetaEngine2D : public MetaEngine,
}
*/
#endif // METADISPATCHINGENGINE2D_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef NULLGUI_HPP
#define NULLGUI_HPP
#pragma once
// FIXME : there is a problem because I need to link with serialization when I include Factorable because Factorable use some Type described in serialization for the findClassInfo method
#include "FrontEnd.hpp"
......@@ -41,5 +40,4 @@ class NullGUI : public FrontEnd
REGISTER_FACTORABLE(NullGUI);
#endif // NULLGUI_HPP
......@@ -8,8 +8,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef OMEGA_HPP
#define OMEGA_HPP
#pragma once
// qt3 sucks
#ifdef EMBED_PYTHON
......@@ -168,5 +167,4 @@ class Omega : public Singleton<Omega>
FRIEND_SINGLETON(Omega);
};
#endif // OMEGA_HPP
......@@ -8,8 +8,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef PHYSICALACTION_HPP
#define PHYSICALACTION_HPP
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
......@@ -34,5 +33,4 @@ class PhysicalAction : public Serializable, public Indexable
REGISTER_SERIALIZABLE(PhysicalAction);
#endif // PHYSICALACTION_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef PREFERENCES_HPP
#define PREFERENCES_HPP
#pragma once
#include <iostream>
#include <vector>
......@@ -31,5 +30,4 @@ class Preferences : public Serializable
REGISTER_SERIALIZABLE(Preferences);
#endif // PREFERENCES_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef RENDERINGENGINE_HPP
#define RENDERINGENGINE_HPP
#pragma once
#include "MetaBody.hpp"
#include<yade/lib-serialization/Serializable.hpp>
......@@ -28,5 +27,4 @@ class RenderingEngine : public Serializable
REGISTER_SERIALIZABLE(RenderingEngine);
#endif // RENDERINGENGINE_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef SIMULATION_FLOW_HPP
#define SIMULATION_FLOW_HPP
#pragma once
#include "ThreadWorker.hpp"
......@@ -18,6 +17,5 @@ class SimulationFlow // FIXME ; bad name
virtual void singleAction();
};
#endif
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef STANDALONEENGINE_HPP
#define STANDALONEENGINE_HPP
#pragma once
#include "Engine.hpp"
......@@ -21,5 +20,4 @@ class StandAloneEngine : public Engine
};
REGISTER_SERIALIZABLE(StandAloneEngine);
#endif // STANDALONEENGINE_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef STANDALONESIMULATOR_HPP
#define STANDALONESIMULATOR_HPP
#pragma once
#include<yade/lib-serialization/Serializable.hpp>
#include <Wm3Math.h>
......@@ -42,5 +41,4 @@ class StandAloneSimulator : public Serializable
REGISTER_SERIALIZABLE(StandAloneSimulator);
#endif // STANDALONESIMULATOR_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef THREAD_RUNNER_HPP
#define THREAD_RUNNER_HPP
#pragma once
#include <boost/thread/mutex.hpp>
......@@ -70,5 +69,4 @@ class ThreadRunner
bool looping();
};
#endif // SIMULATIONLOOP_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef THREAD_WORKER_HPP
#define THREAD_WORKER_HPP
#pragma once
#include <boost/thread/mutex.hpp>
#include <boost/any.hpp>
......@@ -61,5 +60,4 @@ class ThreadWorker // perhaps simulation steps, or stage? as it is a sin
boost::any getReturnValue();
};
#endif
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef TIMESTEPPER_HPP
#define TIMESTEPPER_HPP
#pragma once
#include <list>
#include <vector>
......@@ -35,5 +34,4 @@ class TimeStepper : public StandAloneEngine
REGISTER_SERIALIZABLE(TimeStepper);
#endif // TIMESTEPPER_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef YADE_EXCEPTIONS_HPP
#define YADE_EXCEPTIONS_HPP
#pragma once
#include <string>
#include <stdexcept>
......@@ -29,5 +28,4 @@ struct yadeExceptions
static const char* BadFile;
};
#endif // YADE_EXCEPTIONS_HPP
......@@ -8,8 +8,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef SPHERE_PADDER_HPP
#define SPHERE_PADDER_HPP
#pragma once
#include "TetraMesh.hpp"
#include "CellPartition.hpp"
......@@ -116,5 +115,4 @@ class SpherePadder
};
#endif // SPHERE_PADDER_HPP
......@@ -8,8 +8,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef TETRA_MESH_HPP
#define TETRA_MESH_HPP
#pragma once
#include <vector>
#include <iostream>
......@@ -77,4 +76,3 @@ public:
void read_gmsh (const char* name);
};
#endif // TETRA_MESH_HPP
......@@ -6,8 +6,7 @@
Any further documentation is in doxygen comments.
*/
#ifndef CLUMP_HPP
#define CLUMP_HPP
#pragma once
#include<vector>
#include<map>
......@@ -147,8 +146,3 @@ class ClumpTestGen : public FileGenerator {
REGISTER_SERIALIZABLE(ClumpTestGen);
#endif /* CLUMP_HPP */
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef CONTACT_HPP
#define CONTACT_HPP
#pragma once
#include<Wm3Math.h>
#include<Wm3Vector3.h>
......@@ -61,5 +60,4 @@ struct lessThanContact
typedef set<Contact,lessThanContact> ContactSet;
typedef vector<ContactSet> ContactVecSet;
#endif // __CONTACT_HPP__
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef PERSISTENTSAPCOLLIDER_HPP
#define PERSISTENTSAPCOLLIDER_HPP
#pragma once
#include "SphericalDEM.hpp"
#include "Contact.hpp"
......@@ -83,5 +82,3 @@ class PersistentAloneSAPCollider
};
#endif // PERSISTENTSAPCOLLIDER_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef SPHERICALDEM_HPP
#define SPHERICALDEM_HPP
#pragma once
#include <Wm3Math.h>
#include<yade/lib-base/yadeWm3.hpp>
......@@ -52,5 +51,4 @@ struct SphericalDEM
Vector3r momentum;
};
#endif // SPHERICALDEM_HPP
......@@ -6,8 +6,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
#ifndef SPHERICALDEMSIMULATOR_HPP
#define SPHERICALDEMSIMULATOR_HPP
#pragma once
#include "SphericalDEM.hpp"
#include "Contact.hpp"
......@@ -62,5 +61,4 @@ class SphericalDEMSimulator : public StandAloneSimulator
REGISTER_FACTORABLE(SphericalDEMSimulator);