Commit e8ec9c88 authored by Sreekanth Arikatla's avatar Sreekanth Arikatla
Browse files

Merge branch 'ChangeHeaderGuardToPragmaOnce' into 'master'

Change header guard macro to #pragma once for all header files

See merge request !331
parents f78a2df8 9d3c19e4
Pipeline #139925 passed with stage
in 0 seconds
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkRenderParticleEmitter_h
#define imstkRenderParticleEmitter_h
#pragma once
#include <memory>
#include <vector>
......@@ -208,5 +207,3 @@ protected:
std::vector<std::unique_ptr<RenderParticle>> * m_particles;
};
} // imstk
#endif // ifndef imstkRenderParticleEmitter_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkCollisionData_h
#define imstkCollisionData_h
#pragma once
#include <array>
......@@ -169,5 +168,3 @@ public:
std::vector<PickingCollisionData> NodePickData; ///< List of points that are picked
};
}
#endif // ifndef imstkCollisionData_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkBidirectionalPlaneToSphereCD_h
#define imstkBidirectionalPlaneToSphereCD_h
#pragma once
#include <memory>
......@@ -68,5 +67,3 @@ private:
std::shared_ptr<Sphere> m_sphereB; ///>
};
}
#endif // ifndef imstkBidirectionalPlaneToSphereCD_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkCollisionDetection_h
#define imstkCollisionDetection_h
#pragma once
#include "imstkCollisionData.h"
......@@ -112,5 +111,3 @@ protected:
std::shared_ptr<CollisionData> m_colData; ///< Collision data
};
}
#endif // ifndef imstkCollisionDetection_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkIntersectionTestUtils_h
#define imstkIntersectionTestUtils_h
#pragma once
#include <algorithm>
......@@ -158,5 +157,3 @@ testPointToTriAABB(const double& x1, const double& y1, const double& z1,
min_y - prox2, max_y + prox2, min_z - prox2, max_z + prox2);
}
}
#endif // ifndef imstkIntersectionTestUtils_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkMeshToMeshBruteforceCD_h
#define imstkMeshToMeshBruteforceCD_h
#pragma once
#include <memory>
#include <iostream>
......@@ -75,5 +74,3 @@ private:
std::shared_ptr<SurfaceMesh> m_object2; ///> object 2
};
}
#endif // ifndef imstkMeshToMeshBruteForceCD_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkMeshToMeshCD_h
#define imstkMeshToMeshCD_h
#pragma once
// std library
#include <memory>
......@@ -85,5 +84,3 @@ private:
std::shared_ptr<DeformModel> m_modelB; ///>
};
}
#endif // ifndef imstkMeshToMeshCD_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkPointSetToCapsuleCD_h
#define imstkPointSetToCapsuleCD_h
#pragma once
#include <memory>
......@@ -64,5 +63,3 @@ private:
std::shared_ptr<Capsule> m_capsule; ///> Capsule
};
}
#endif // ifndef imstkPointSetToCapsuleCD_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkPointSetToPlaneCD_h
#define imstkPointSetToPlaneCD_h
#pragma once
#include <memory>
......@@ -64,5 +63,3 @@ private:
std::shared_ptr<Plane> m_plane; ///> Plane
};
}
#endif // ifndef imstkPointSetToPlaneCD_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkPointSetToSphereCD_h
#define imstkPointSetToSphereCD_h
#pragma once
#include <memory>
......@@ -64,5 +63,3 @@ private:
std::shared_ptr<Sphere> m_sphere; ///> Sphere
};
}
#endif // ifndef imstkPointSetToSphereCD_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkPointSetToSpherePickingCD_h
#define imstkPointSetToSpherePickingCD_h
#pragma once
#include <memory>
......@@ -73,5 +72,3 @@ private:
unsigned int m_buttonId = 0; ///> button id
};
}
#endif // ifndef imstkPointSetToSphereCD_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkSphereCylinderCD_h
#define imstkSphereCylinderCD_h
#pragma once
#include <memory>
......@@ -68,5 +67,3 @@ private:
std::shared_ptr<Sphere> m_sphere; ///> colliding sphere
};
}
#endif // ifndef imstkSphereCylinderCD_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkSphereToSphereCD_h
#define imstkSphereToSphereCD_h
#pragma once
#include <memory>
......@@ -67,5 +66,3 @@ private:
std::shared_ptr<Sphere> m_sphereB; ///>
};
}
#endif // ifndef imstkSphereToSphereCD_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkTetrahedralMeshCD_h
#define imstkTetrahedralMeshCD_h
#pragma once
// std library
#include <memory>
......@@ -83,5 +82,3 @@ private:
SpatialHashTableSeparateChaining m_hashTable; ///> Spatial hash table
};
}
#endif // ifndef imstkTetrahedralMeshCD_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkUnidirectionalPlaneToSphereCD_h
#define imstkUnidirectionalPlaneToSphereCD_h
#pragma once
#include <memory>
......@@ -68,5 +67,3 @@ private:
std::shared_ptr<Sphere> m_sphereB; ///>
};
}
#endif // ifndef imstkUnidirectionalToSphereCD_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef ismtkBoneDrillingCH_h
#define imstkBoneDrillingCH_h
#pragma once
// imstk
#include "imstkCollisionHandling.h"
......@@ -98,5 +97,3 @@ private:
Vec3d m_prevPos; ///> Previous position of the colliding object
};
}
#endif // ifndef imstkBoneDrillingCH_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkCollisionHandling_h
#define imstkCollisionHandling_h
#pragma once
// Std library
#include <memory>
......@@ -108,5 +107,3 @@ protected:
const std::shared_ptr<CollisionData> m_colData; ///< Collision data
};
}
#endif // ifndef imstkCollisionHandling_h
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkPenaltyCH_h
#define imstkPenaltyCH_h
#pragma once
// std library
#include <memory>
......@@ -84,5 +83,3 @@ private:
std::shared_ptr<PbdSolver> m_PBDSolver; /// The Solver for the collision constraints
};
}
#endif // ifndef imstkPBDCollisionHandling_h
\ No newline at end of file
......@@ -19,8 +19,7 @@
=========================================================================*/
#ifndef imstkPenaltyCH_h
#define imstkPenaltyCH_h
#pragma once
// std library
#include <memory>
......@@ -89,5 +88,3 @@ private:
double m_damping = 0.5; ///> Damping of the contact
};
}
#endif // ifndef imstkPenaltyCH_h
......@@ -17,10 +17,9 @@
See the License for the specific language governing permissions and
limitations under the License.
=========================================================================*/
=========================================================================*/
#ifndef imstkPickingCH_h
#define imstkPenaltyCH_h
#pragma once
// std library
#include <memory>
......@@ -90,5 +89,3 @@ private:
std::vector<LinearProjectionConstraint> *m_DynamicLinearProjConstraints;
};
}
#endif // ifndef imstkPenaltyCH_h
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment