Adjust internal header dependencies

This commit is contained in:
Behdad Esfahbod 2018-12-21 17:35:58 -05:00
parent 8e5c2bc60b
commit 865deeb3be
7 changed files with 17 additions and 8 deletions

View File

@ -28,13 +28,16 @@
#define HB_ARRAY_HH
#include "hb.hh"
#include "hb-dsalgs.hh"
#include "hb-iter.hh"
#include "hb-null.hh"
template <typename Type>
struct hb_sorted_array_t;
template <typename Type>
struct hb_array_t
struct hb_array_t// : hb_iter_t<hb_array_t<Type>, Type>
{
typedef Type item_t;
enum { item_size = hb_static_size (Type) };

View File

@ -28,7 +28,6 @@
#define HB_DSALGS_HH
#include "hb.hh"
#include "hb-null.hh"

View File

@ -28,6 +28,7 @@
#define HB_ITER_HH
#include "hb.hh"
#include "hb-null.hh"
/* Unified iterator object.

View File

@ -29,6 +29,7 @@
#include "hb.hh"
#include "hb-array.hh"
#include "hb-null.hh"
template <typename Type, unsigned int PreallocedCount=8>

View File

@ -545,14 +545,17 @@ template <typename T> struct hb_remove_pointer<T *> { typedef T value; };
#define hb_remove_pointer(T) hb_remove_pointer<T>::value
/* Headers we include for everyone. Keep sorted. They express dependency amongst
* themselves, but no other file should include them.*/
/* Headers we include for everyone. Keep topologically sorted by dependency.
* They express dependency amongst themselves, but no other file should include
* them directly.*/
#include "hb-atomic.hh"
#include "hb-debug.hh"
#include "hb-dsalgs.hh"
#include "hb-iter.hh"
#include "hb-mutex.hh"
#include "hb-null.hh"
#include "hb-object.hh"
#include "hb-dsalgs.hh" // Requires: hb-null
#include "hb-iter.hh" // Requires: hb-null
#include "hb-debug.hh" // Requires: hb-atomic hb-dsalgs
#include "hb-array.hh" // Requires: hb-dsalgs hb-iter hb-null
#include "hb-vector.hh" // Requires: hb-array hb-null
#include "hb-object.hh" // Requires: hb-atomic hb-mutex hb-vector
#endif /* HB_HH */

View File

@ -24,6 +24,7 @@
* Google Author(s): Behdad Esfahbod
*/
#include "hb.hh"
#include "hb-iter.hh"
#include "hb-array.hh"

View File

@ -24,6 +24,7 @@
* Google Author(s): Garret Rieger
*/
#include "hb.hh"
#include "hb-ot-os2-unicode-ranges.hh"
static void