diff options
author | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:03 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:58 +0300 |
commit | 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch) | |
tree | ec50d7bdca3901a6afcc986943011f08f9516307 /intern/cycles/util | |
parent | 008aaaa37841ca27d2bba80d8859336655cef455 (diff) |
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'intern/cycles/util')
-rw-r--r-- | intern/cycles/util/util_boundbox.h | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_disjoint_set.h | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_half.h | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_md5.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_path.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/util/util_profiling.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_progress.h | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_sky_model.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_string.h | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_system.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/util/util_task.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_thread.h | 4 | ||||
-rw-r--r-- | intern/cycles/util/util_transform.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_types.h | 2 |
14 files changed, 17 insertions, 17 deletions
diff --git a/intern/cycles/util/util_boundbox.h b/intern/cycles/util/util_boundbox.h index b5c3f1a8954..7fab7bd5a15 100644 --- a/intern/cycles/util/util_boundbox.h +++ b/intern/cycles/util/util_boundbox.h @@ -17,8 +17,8 @@ #ifndef __UTIL_BOUNDBOX_H__ #define __UTIL_BOUNDBOX_H__ -#include <math.h> #include <float.h> +#include <math.h> #include "util/util_math.h" #include "util/util_string.h" diff --git a/intern/cycles/util/util_disjoint_set.h b/intern/cycles/util/util_disjoint_set.h index 80f3c714a29..946632371d2 100644 --- a/intern/cycles/util/util_disjoint_set.h +++ b/intern/cycles/util/util_disjoint_set.h @@ -17,8 +17,8 @@ #ifndef __UTIL_DISJOINT_SET_H__ #define __UTIL_DISJOINT_SET_H__ -#include <utility> #include "util_array.h" +#include <utility> CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_half.h b/intern/cycles/util/util_half.h index 647e9cf2fd6..8de62893ba8 100644 --- a/intern/cycles/util/util_half.h +++ b/intern/cycles/util/util_half.h @@ -17,8 +17,8 @@ #ifndef __UTIL_HALF_H__ #define __UTIL_HALF_H__ -#include "util/util_types.h" #include "util/util_math.h" +#include "util/util_types.h" #ifdef __KERNEL_SSE2__ # include "util/util_simd.h" diff --git a/intern/cycles/util/util_md5.cpp b/intern/cycles/util/util_md5.cpp index c11f495f785..0df521c2b58 100644 --- a/intern/cycles/util/util_md5.cpp +++ b/intern/cycles/util/util_md5.cpp @@ -26,8 +26,8 @@ #include "util_md5.h" #include "util_path.h" -#include <string.h> #include <stdio.h> +#include <string.h> CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp index 77293c45f6b..8905c8bc7f0 100644 --- a/intern/cycles/util/util_path.cpp +++ b/intern/cycles/util/util_path.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "util/util_md5.h" #include "util/util_path.h" +#include "util/util_md5.h" #include "util/util_string.h" #include <OpenImageIO/filesystem.h> @@ -36,8 +36,8 @@ OIIO_NAMESPACE_USING # define DIR_SEP '/' # include <dirent.h> # include <pwd.h> -# include <unistd.h> # include <sys/types.h> +# include <unistd.h> #endif #ifdef HAVE_SHLWAPI_H diff --git a/intern/cycles/util/util_profiling.cpp b/intern/cycles/util/util_profiling.cpp index dc5bc35c48d..073b09f719f 100644 --- a/intern/cycles/util/util_profiling.cpp +++ b/intern/cycles/util/util_profiling.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ +#include "util/util_profiling.h" #include "util/util_algorithm.h" #include "util/util_foreach.h" -#include "util/util_profiling.h" #include "util/util_set.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_progress.h b/intern/cycles/util/util_progress.h index 23e49b4db7a..26534a29dfe 100644 --- a/intern/cycles/util/util_progress.h +++ b/intern/cycles/util/util_progress.h @@ -25,8 +25,8 @@ #include "util/util_function.h" #include "util/util_string.h" -#include "util/util_time.h" #include "util/util_thread.h" +#include "util/util_time.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_sky_model.cpp b/intern/cycles/util/util_sky_model.cpp index 4a6a9f32607..8cdad8a90a4 100644 --- a/intern/cycles/util/util_sky_model.cpp +++ b/intern/cycles/util/util_sky_model.cpp @@ -101,9 +101,9 @@ All instructions on how to use this code are in the accompanying header file. #include "util/util_sky_model_data.h" #include <assert.h> +#include <math.h> #include <stdio.h> #include <stdlib.h> -#include <math.h> CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_string.h b/intern/cycles/util/util_string.h index f71145741c9..ce2d4acdde4 100644 --- a/intern/cycles/util/util_string.h +++ b/intern/cycles/util/util_string.h @@ -17,9 +17,9 @@ #ifndef __UTIL_STRING_H__ #define __UTIL_STRING_H__ +#include <sstream> #include <string.h> #include <string> -#include <sstream> #include "util/util_vector.h" diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp index f700f9bd277..6d32153209a 100644 --- a/intern/cycles/util/util_system.cpp +++ b/intern/cycles/util/util_system.cpp @@ -17,8 +17,8 @@ #include "util/util_system.h" #include "util/util_logging.h" -#include "util/util_types.h" #include "util/util_string.h" +#include "util/util_types.h" #include <numaapi.h> @@ -35,8 +35,8 @@ OIIO_NAMESPACE_USING # include <sys/sysctl.h> # include <sys/types.h> #else -# include <unistd.h> # include <sys/ioctl.h> +# include <unistd.h> #endif CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/util_task.cpp b/intern/cycles/util/util_task.cpp index 24286116dfb..61aa28c6815 100644 --- a/intern/cycles/util/util_task.cpp +++ b/intern/cycles/util/util_task.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ +#include "util/util_task.h" #include "util/util_foreach.h" #include "util/util_logging.h" #include "util/util_system.h" -#include "util/util_task.h" #include "util/util_time.h" //#define THREADING_DEBUG_ENABLED diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h index 18ec5b32144..f6dbc9186b8 100644 --- a/intern/cycles/util/util_thread.h +++ b/intern/cycles/util/util_thread.h @@ -17,11 +17,11 @@ #ifndef __UTIL_THREAD_H__ #define __UTIL_THREAD_H__ -#include <thread> -#include <mutex> #include <condition_variable> #include <functional> +#include <mutex> #include <queue> +#include <thread> #ifdef _WIN32 # include "util_windows.h" diff --git a/intern/cycles/util/util_transform.cpp b/intern/cycles/util/util_transform.cpp index 302a8a386ac..101122740d7 100644 --- a/intern/cycles/util/util_transform.cpp +++ b/intern/cycles/util/util_transform.cpp @@ -46,8 +46,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "util/util_projection.h" #include "util/util_transform.h" +#include "util/util_projection.h" #include "util/util_boundbox.h" #include "util/util_math.h" diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index 8a1890ad319..f6535848480 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -153,8 +153,8 @@ CCL_NAMESPACE_END /* SSE types. */ #ifndef __KERNEL_GPU__ # include "util/util_sseb.h" -# include "util/util_ssei.h" # include "util/util_ssef.h" +# include "util/util_ssei.h" # if defined(__KERNEL_AVX__) || defined(__KERNEL_AVX2__) # include "util/util_avxb.h" # include "util/util_avxf.h" |