Skip to content

Commit

Permalink
clang format fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
starseeker committed Sep 28, 2024
1 parent 2f4b8fc commit ef30a7e
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 18 deletions.
4 changes: 2 additions & 2 deletions src/collider.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
// limitations under the License.

#pragma once
#include "manifold/common.h"
#include "manifold/parallel.h"
#include "./sparse.h"
#include "./utils.h"
#include "./vec.h"
#include "manifold/common.h"
#include "manifold/parallel.h"

#ifdef _MSC_VER
#include <intrin.h>
Expand Down
2 changes: 1 addition & 1 deletion src/csg_tree.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
// limitations under the License.

#pragma once
#include "manifold/manifold.h"
#include "./utils.h"
#include "manifold/manifold.h"

namespace manifold {

Expand Down
2 changes: 1 addition & 1 deletion src/hashtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#include <atomic>

#include "manifold/common.h"
#include "./vec.h"
#include "manifold/common.h"

namespace {
typedef unsigned long long int Uint64;
Expand Down
2 changes: 1 addition & 1 deletion src/impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include <map>

#include "./hashtable.h"
#include "manifold/parallel.h"
#include "./svd.h"
#include "manifold/parallel.h"
#include "mesh_fixes.h"

namespace {
Expand Down
6 changes: 3 additions & 3 deletions src/impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
#include <map>

#include "./collider.h"
#include "manifold/manifold.h"
#include "manifold/optional_assert.h"
#include "manifold/polygon.h"
#include "./sparse.h"
#include "./utils.h"
#include "./vec.h"
#include "manifold/manifold.h"
#include "manifold/optional_assert.h"
#include "manifold/polygon.h"
#include "quickhull.h"
#include "shared.h"

Expand Down
3 changes: 1 addition & 2 deletions src/meshIOc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "manifold/meshIO.h"

#include "manifold/conv.h"
#include "manifold/meshIO.h"
#include "manifold/types.h"

// C <-> C++ conversions
Expand Down
2 changes: 1 addition & 1 deletion src/polygon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include <set>

#include "./collider.h"
#include "manifold/optional_assert.h"
#include "./utils.h"
#include "manifold/optional_assert.h"

namespace {
using namespace manifold;
Expand Down
6 changes: 3 additions & 3 deletions src/sdf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

#include <glm/gtc/integer.hpp>

#include "impl.h"
#include "./impl.h"
#include "./hashtable.h"
#include "manifold/manifold.h"
#include "manifold/parallel.h"
#include "./utils.h"
#include "./vec.h"
#include "manifold/manifold.h"
#include "manifold/parallel.h"

namespace {
using namespace manifold;
Expand Down
2 changes: 1 addition & 1 deletion src/shared.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

#pragma once

#include "manifold/parallel.h"
#include "./sparse.h"
#include "./utils.h"
#include "./vec.h"
#include "manifold/parallel.h"

namespace manifold {

Expand Down
4 changes: 2 additions & 2 deletions src/sparse.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
#pragma once
#include <math.h>

#include "./utils.h"
#include "./vec.h"
#include "manifold/common.h"
#include "manifold/optional_assert.h"
#include "manifold/parallel.h"
#include "./utils.h"
#include "./vec.h"

namespace {
template <typename T>
Expand Down
2 changes: 1 addition & 1 deletion src/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <iostream>
#endif

#include "manifold/parallel.h"
#include "./vec.h"
#include "manifold/parallel.h"

#if __has_include(<tracy/Tracy.hpp>)
#include <tracy/Tracy.hpp>
Expand Down

0 comments on commit ef30a7e

Please sign in to comment.