From 99ab91b451552f48fddc7a95b32e34b720194bc8 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Sun, 29 Jan 2012 18:06:47 +0000 Subject: [PATCH] use #include "file.h" instead of #include in HACD --- Extras/HACD/hacdCircularList.h | 6 +++--- Extras/HACD/hacdCircularList.inl | 4 ++-- Extras/HACD/hacdGraph.cpp | 4 ++-- Extras/HACD/hacdGraph.h | 8 ++++---- Extras/HACD/hacdHACD.cpp | 8 ++++---- Extras/HACD/hacdHACD.h | 10 +++++----- Extras/HACD/hacdICHull.cpp | 2 +- Extras/HACD/hacdICHull.h | 8 ++++---- Extras/HACD/hacdManifoldMesh.cpp | 4 ++-- Extras/HACD/hacdManifoldMesh.h | 8 ++++---- Extras/HACD/hacdVector.h | 4 ++-- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Extras/HACD/hacdCircularList.h b/Extras/HACD/hacdCircularList.h index 83b83110f..d67353678 100644 --- a/Extras/HACD/hacdCircularList.h +++ b/Extras/HACD/hacdCircularList.h @@ -16,7 +16,7 @@ #ifndef HACD_CIRCULAR_LIST_H #define HACD_CIRCULAR_LIST_H #include -#include +#include "hacdVersion.h" namespace HACD { //! CircularListElement class. @@ -76,5 +76,5 @@ namespace HACD }; } -#include -#endif \ No newline at end of file +#include "hacdCircularList.inl" +#endif diff --git a/Extras/HACD/hacdCircularList.inl b/Extras/HACD/hacdCircularList.inl index 108f288cc..1d48f4edb 100644 --- a/Extras/HACD/hacdCircularList.inl +++ b/Extras/HACD/hacdCircularList.inl @@ -2,7 +2,7 @@ #ifndef HACD_CIRCULAR_LIST_INL #define HACD_CIRCULAR_LIST_INL #include -#include +#include "hacdVersion.h" namespace HACD { template < typename T > @@ -160,4 +160,4 @@ namespace HACD return (*this); } } -#endif \ No newline at end of file +#endif diff --git a/Extras/HACD/hacdGraph.cpp b/Extras/HACD/hacdGraph.cpp index 4b2257137..bd7c73ed3 100644 --- a/Extras/HACD/hacdGraph.cpp +++ b/Extras/HACD/hacdGraph.cpp @@ -12,7 +12,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "hacdGraph.h" namespace HACD { @@ -289,4 +289,4 @@ namespace HACD } return static_cast(m_nCCs); } -} \ No newline at end of file +} diff --git a/Extras/HACD/hacdGraph.h b/Extras/HACD/hacdGraph.h index 8d2d105eb..12b0d3c7e 100644 --- a/Extras/HACD/hacdGraph.h +++ b/Extras/HACD/hacdGraph.h @@ -15,9 +15,9 @@ #pragma once #ifndef HACD_GRAPH_H #define HACD_GRAPH_H -#include -#include -#include +#include "hacdVersion.h" +#include "hacdVector.h" +#include "hacdICHull.h" #include #include #include @@ -117,4 +117,4 @@ namespace HACD friend class HACD; }; } -#endif \ No newline at end of file +#endif diff --git a/Extras/HACD/hacdHACD.cpp b/Extras/HACD/hacdHACD.cpp index c4b028777..7473b0f3e 100644 --- a/Extras/HACD/hacdHACD.cpp +++ b/Extras/HACD/hacdHACD.cpp @@ -17,9 +17,9 @@ #endif //_CRT_SECURE_NO_WARNINGS #include -#include -#include -#include +#include "hacdGraph.h" +#include "hacdHACD.h" +#include "hacdICHull.h" #include #include #include @@ -830,4 +830,4 @@ namespace HACD return false; } } -} \ No newline at end of file +} diff --git a/Extras/HACD/hacdHACD.h b/Extras/HACD/hacdHACD.h index 732ace784..6c8dc7b13 100644 --- a/Extras/HACD/hacdHACD.h +++ b/Extras/HACD/hacdHACD.h @@ -15,10 +15,10 @@ #pragma once #ifndef HACD_HACD_H #define HACD_HACD_H -#include -#include -#include -#include +#include "hacdVersion.h" +#include "hacdVector.h" +#include "hacdGraph.h" +#include "hacdICHull.h" #include #include #include @@ -279,4 +279,4 @@ namespace HACD }; } -#endif \ No newline at end of file +#endif diff --git a/Extras/HACD/hacdICHull.cpp b/Extras/HACD/hacdICHull.cpp index 069581750..42c50b780 100644 --- a/Extras/HACD/hacdICHull.cpp +++ b/Extras/HACD/hacdICHull.cpp @@ -12,7 +12,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "hacdICHull.h" #include namespace HACD { diff --git a/Extras/HACD/hacdICHull.h b/Extras/HACD/hacdICHull.h index 29ae6d53c..fbe4ef600 100644 --- a/Extras/HACD/hacdICHull.h +++ b/Extras/HACD/hacdICHull.h @@ -15,9 +15,9 @@ #pragma once #ifndef HACD_ICHULL_H #define HACD_ICHULL_H -#include -#include -#include +#include "hacdVersion.h" +#include "hacdManifoldMesh.h" +#include "hacdVector.h" #include #include namespace HACD @@ -117,4 +117,4 @@ namespace HACD }; } -#endif \ No newline at end of file +#endif diff --git a/Extras/HACD/hacdManifoldMesh.cpp b/Extras/HACD/hacdManifoldMesh.cpp index a92e9fc3e..399fda08c 100644 --- a/Extras/HACD/hacdManifoldMesh.cpp +++ b/Extras/HACD/hacdManifoldMesh.cpp @@ -12,7 +12,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "hacdManifoldMesh.h" using namespace std; @@ -574,4 +574,4 @@ namespace HACD } return false; } -} \ No newline at end of file +} diff --git a/Extras/HACD/hacdManifoldMesh.h b/Extras/HACD/hacdManifoldMesh.h index 3031480a9..5d2ececbf 100644 --- a/Extras/HACD/hacdManifoldMesh.h +++ b/Extras/HACD/hacdManifoldMesh.h @@ -32,9 +32,9 @@ All rights reserved. #define HACD_MANIFOLD_MESH_H #include #include -#include -#include -#include +#include "hacdVersion.h" +#include "hacdCircularList.h" +#include "hacdVector.h" #include namespace HACD { @@ -247,4 +247,4 @@ namespace HACD Vec3 & pa, Vec3 & pb, double & mua, double &mub); } -#endif \ No newline at end of file +#endif diff --git a/Extras/HACD/hacdVector.h b/Extras/HACD/hacdVector.h index cb142827d..4006c4b8f 100644 --- a/Extras/HACD/hacdVector.h +++ b/Extras/HACD/hacdVector.h @@ -17,7 +17,7 @@ #define HACD_VECTOR_H #include #include -#include +#include "hacdVersion.h" namespace HACD { @@ -64,4 +64,4 @@ namespace HACD } #include "hacdVector.inl" // template implementation -#endif \ No newline at end of file +#endif