Skip to content

Commit

Permalink
change #include <> to #include for non-system headers.
Browse files Browse the repository at this point in the history
  • Loading branch information
MFraters committed Jun 27, 2021
1 parent ca00e4d commit d515960
Show file tree
Hide file tree
Showing 151 changed files with 829 additions and 835 deletions.
8 changes: 4 additions & 4 deletions app/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
#include <iostream>
#include <memory>

#include <world_builder/assert.h>
#include <world_builder/utilities.h>
#include <world_builder/world.h>
#include "world_builder/assert.h"
#include "world_builder/utilities.h"
#include "world_builder/world.h"

#include <app/main.h>
#include "app/main.h"

using namespace WorldBuilder::Utilities;

Expand Down
2 changes: 1 addition & 1 deletion examples/C/example.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

#include <world_builder/wrapper_c.h>
#include "world_builder/wrapper_c.h"
#include <stdio.h>

int main() {
Expand Down
2 changes: 1 addition & 1 deletion include/rapidjson/rapidjson.h
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ RAPIDJSON_NAMESPACE_END
\ref RAPIDJSON_ERRORS APIs.
*/
#ifndef RAPIDJSON_ASSERT
#include <world_builder/assert.h>
#include "world_builder/assert.h"
#define RAPIDJSON_ASSERT(x) WBAssertThrow(x, "RapidJSON error.")
#endif // RAPIDJSON_ASSERT

Expand Down
4 changes: 2 additions & 2 deletions include/world_builder/coordinate_systems/cartesian.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#ifndef _world_builder_coordinate_systems_cartesian_h
#define _world_builder_coordinate_systems_cartesian_h

#include <world_builder/utilities.h>
#include <world_builder/coordinate_systems/interface.h>
#include "world_builder/utilities.h"
#include "world_builder/coordinate_systems/interface.h"


namespace WorldBuilder
Expand Down
10 changes: 5 additions & 5 deletions include/world_builder/coordinate_systems/interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
#ifndef _world_builder_coordinate_systems_interface_h
#define _world_builder_coordinate_systems_interface_h

#include <world_builder/coordinate_system.h>
#include <world_builder/parameters.h>
#include <world_builder/utilities.h>
#include <world_builder/world.h>
#include <world_builder/types/string.h>
#include "world_builder/coordinate_system.h"
#include "world_builder/parameters.h"
#include "world_builder/utilities.h"
#include "world_builder/world.h"
#include "world_builder/types/string.h"


namespace WorldBuilder
Expand Down
4 changes: 2 additions & 2 deletions include/world_builder/coordinate_systems/spherical.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#ifndef _world_builder_coordinate_systems_spherical_h
#define _world_builder_coordinate_systems_spherical_h

#include <world_builder/utilities.h>
#include <world_builder/coordinate_systems/interface.h>
#include "world_builder/utilities.h"
#include "world_builder/coordinate_systems/interface.h"


namespace WorldBuilder
Expand Down
10 changes: 5 additions & 5 deletions include/world_builder/features/continental_plate.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
#ifndef _world_feature_features_continental_plate_h
#define _world_feature_features_continental_plate_h

#include <world_builder/features/interface.h>
#include <world_builder/world.h>
#include "world_builder/features/interface.h"
#include "world_builder/world.h"

#include <world_builder/features/continental_plate_models/temperature/interface.h>
#include <world_builder/features/continental_plate_models/composition/interface.h>
#include <world_builder/features/continental_plate_models/grains/interface.h>
#include "world_builder/features/continental_plate_models/temperature/interface.h"
#include "world_builder/features/continental_plate_models/composition/interface.h"
#include "world_builder/features/continental_plate_models/grains/interface.h"


namespace WorldBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
#include <map>


#include <world_builder/world.h>
#include <world_builder/parameters.h>
#include <world_builder/point.h>
#include "world_builder/world.h"
#include "world_builder/parameters.h"
#include "world_builder/point.h"


namespace WorldBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#ifndef _world_builder_features_continental_plate_composition_uniform_h
#define _world_builder_features_continental_plate_composition_uniform_h

#include <world_builder/features/continental_plate_models/composition/interface.h>
#include <world_builder/world.h>
#include "world_builder/features/continental_plate_models/composition/interface.h"
#include "world_builder/world.h"


namespace WorldBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
#include <map>


#include <world_builder/world.h>
#include <world_builder/parameters.h>
#include <world_builder/point.h>
#include "world_builder/world.h"
#include "world_builder/parameters.h"
#include "world_builder/point.h"


namespace WorldBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#ifndef _world_builder_features_continental_plate_grains_random_uniform_distribution_h
#define _world_builder_features_continental_plate_grains_random_uniform_distribution_h

#include <world_builder/features/continental_plate_models/grains/interface.h>
#include <world_builder/world.h>
#include "world_builder/features/continental_plate_models/grains/interface.h"
#include "world_builder/world.h"

namespace WorldBuilder
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#ifndef _world_builder_features_continental_plate_grains_uniform_h
#define _world_builder_features_continental_plate_grains_uniform_h

#include <world_builder/features/continental_plate_models/grains/interface.h>
#include <world_builder/world.h>
#include "world_builder/features/continental_plate_models/grains/interface.h"
#include "world_builder/world.h"

namespace WorldBuilder
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#ifndef _world_builder_features_continental_plate_temperature_adiabatic_h
#define _world_builder_features_continental_plate_temperature_adiabatic_h

#include <world_builder/features/continental_plate_models/temperature/interface.h>
#include <world_builder/features/utilities.h>
#include <world_builder/world.h>
#include "world_builder/features/continental_plate_models/temperature/interface.h"
#include "world_builder/features/utilities.h"
#include "world_builder/world.h"


namespace WorldBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
#include <vector>
#include <map>

#include <world_builder/world.h>
#include <world_builder/parameters.h>
#include <world_builder/point.h>
#include "world_builder/world.h"
#include "world_builder/parameters.h"
#include "world_builder/point.h"


namespace WorldBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#ifndef _world_builder_features_continental_plate_temperature_linear_h
#define _world_builder_features_continental_plate_temperature_linear_h

#include <world_builder/features/continental_plate_models/temperature/interface.h>
#include <world_builder/features/utilities.h>
#include <world_builder/world.h>
#include "world_builder/features/continental_plate_models/temperature/interface.h"
#include "world_builder/features/utilities.h"
#include "world_builder/world.h"


namespace WorldBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#ifndef _world_builder_features_continental_plate_temperature_uniform_h
#define _world_builder_features_continental_plate_temperature_uniform_h

#include <world_builder/features/continental_plate_models/temperature/interface.h>
#include <world_builder/features/utilities.h>
#include <world_builder/world.h>
#include "world_builder/features/continental_plate_models/temperature/interface.h"
#include "world_builder/features/utilities.h"
#include "world_builder/world.h"


namespace WorldBuilder
Expand Down
12 changes: 6 additions & 6 deletions include/world_builder/features/fault.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
#ifndef _world_feature_features_fault_h
#define _world_feature_features_fault_h

#include <world_builder/features/interface.h>
#include <world_builder/world.h>
#include <world_builder/types/segment.h>
#include "world_builder/features/interface.h"
#include "world_builder/world.h"
#include "world_builder/types/segment.h"

#include <world_builder/features/fault_models/temperature/interface.h>
#include <world_builder/features/fault_models/composition/interface.h>
#include <world_builder/features/fault_models/grains/interface.h>
#include "world_builder/features/fault_models/temperature/interface.h"
#include "world_builder/features/fault_models/composition/interface.h"
#include "world_builder/features/fault_models/grains/interface.h"


namespace WorldBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@
#ifndef _world_builder_features_fault_composition_interface_h
#define _world_builder_features_fault_composition_interface_h

#include "world_builder/world.h"
#include "world_builder/parameters.h"
#include "world_builder/point.h"
#include "world_builder/utilities.h"

#include <vector>
#include <map>

#include <world_builder/world.h>
#include <world_builder/parameters.h>
#include <world_builder/point.h>
#include <world_builder/utilities.h>


namespace WorldBuilder
{
class World;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#ifndef _world_builder_features_fault_composition_uniform_h
#define _world_builder_features_fault_composition_uniform_h

#include <world_builder/features/fault_models/composition/interface.h>
#include <world_builder/world.h>
#include "world_builder/features/fault_models/composition/interface.h"
#include "world_builder/world.h"


namespace WorldBuilder
Expand Down
11 changes: 5 additions & 6 deletions include/world_builder/features/fault_models/grains/interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@
#ifndef _world_builder_features_fault_grains_interface_h
#define _world_builder_features_fault_grains_interface_h

#include "world_builder/world.h"
#include "world_builder/parameters.h"
#include "world_builder/point.h"
#include "world_builder/utilities.h"

#include <vector>
#include <map>

#include <world_builder/world.h>
#include <world_builder/parameters.h>
#include <world_builder/point.h>
#include <world_builder/utilities.h>


namespace WorldBuilder
{
class World;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#ifndef _world_builder_features_fault_grains_random_uniform_distribution_h
#define _world_builder_features_fault_grains_random_uniform_distribution_h

#include <world_builder/features/fault_models/grains/interface.h>
#include <world_builder/world.h>
#include "world_builder/features/fault_models/grains/interface.h"
#include "world_builder/world.h"

namespace WorldBuilder
{
Expand Down
4 changes: 2 additions & 2 deletions include/world_builder/features/fault_models/grains/uniform.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#ifndef _world_builder_features_fault_grains_uniform_h
#define _world_builder_features_fault_grains_uniform_h

#include <world_builder/features/fault_models/grains/interface.h>
#include <world_builder/world.h>
#include "world_builder/features/fault_models/grains/interface.h"
#include "world_builder/world.h"

namespace WorldBuilder
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#ifndef _world_builder_features_fault_temperature_adiabatic_h
#define _world_builder_features_fault_temperature_adiabatic_h

#include <world_builder/features/fault_models/temperature/interface.h>
#include <world_builder/features/utilities.h>
#include <world_builder/world.h>
#include "world_builder/features/fault_models/temperature/interface.h"
#include "world_builder/features/utilities.h"
#include "world_builder/world.h"


namespace WorldBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@
#ifndef _world_builder_features_fault_temperature_interface_h
#define _world_builder_features_fault_temperature_interface_h

#include "world_builder/world.h"
#include "world_builder/parameters.h"
#include "world_builder/point.h"
#include "world_builder/utilities.h"

#include <vector>
#include <map>

#include <world_builder/world.h>
#include <world_builder/parameters.h>
#include <world_builder/point.h>
#include <world_builder/utilities.h>


namespace WorldBuilder
{
class World;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#ifndef _world_builder_features_fault_temperature_linear_h
#define _world_builder_features_fault_temperature_linear_h

#include <world_builder/features/fault_models/temperature/interface.h>
#include <world_builder/features/utilities.h>
#include <world_builder/world.h>
#include "world_builder/features/fault_models/temperature/interface.h"
#include "world_builder/features/utilities.h"
#include "world_builder/world.h"


namespace WorldBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#ifndef _world_builder_features_fault_temperature_uniform_h
#define _world_builder_features_fault_temperature_uniform_h

#include <world_builder/features/fault_models/temperature/interface.h>
#include <world_builder/features/utilities.h>
#include <world_builder/world.h>
#include "world_builder/features/fault_models/temperature/interface.h"
#include "world_builder/features/utilities.h"
#include "world_builder/world.h"


namespace WorldBuilder
Expand Down
8 changes: 4 additions & 4 deletions include/world_builder/features/interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
#include <map>
#include <vector>

#include <world_builder/world.h>
#include <world_builder/parameters.h>
#include <world_builder/point.h>
#include <world_builder/utilities.h>
#include "world_builder/world.h"
#include "world_builder/parameters.h"
#include "world_builder/point.h"
#include "world_builder/utilities.h"

namespace WorldBuilder
{
Expand Down
10 changes: 5 additions & 5 deletions include/world_builder/features/mantle_layer.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
#ifndef _world_feature_features_mantle_layer_h
#define _world_feature_features_mantle_layer_h

#include <world_builder/features/interface.h>
#include <world_builder/world.h>
#include "world_builder/features/interface.h"
#include "world_builder/world.h"

#include <world_builder/features/mantle_layer_models/temperature/interface.h>
#include <world_builder/features/mantle_layer_models/composition/interface.h>
#include <world_builder/features/mantle_layer_models/grains/interface.h>
#include "world_builder/features/mantle_layer_models/temperature/interface.h"
#include "world_builder/features/mantle_layer_models/composition/interface.h"
#include "world_builder/features/mantle_layer_models/grains/interface.h"


namespace WorldBuilder
Expand Down
Loading

0 comments on commit d515960

Please sign in to comment.