From 81208752091c69aa1c0418b10eb953af724219de Mon Sep 17 00:00:00 2001 From: Esteban Tovagliari Date: Sat, 7 Mar 2020 10:52:53 +0100 Subject: [PATCH] Move foundation hash and log related files to their own directories --- .../distancefieldobject.cpp | 2 +- .../examples/cpp/heightfield/heightfield.cpp | 2 +- .../examples/cpp/helloworld/helloworld.cpp | 4 +- src/appleseed.bench/main/main.cpp | 2 +- .../mainwindow/applicationsettingswindow.cpp | 2 +- src/appleseed.bench/mainwindow/mainwindow.cpp | 2 +- src/appleseed.cli/commandlinehandler.cpp | 2 +- src/appleseed.cli/main.cpp | 2 +- .../application/application.cpp | 2 +- .../application/application.h | 2 +- .../application/commandlinehandlerbase.cpp | 2 +- .../application/progresstilecallback.cpp | 4 +- .../application/superlogger.h | 2 +- src/appleseed.python/bindlogger.cpp | 2 +- src/appleseed.python/bindmeshobject.cpp | 2 +- src/appleseed.python/bindmurmurhash.cpp | 2 +- src/appleseed.qtcommon/widgets/qtlogtarget.h | 2 +- .../main/commandlinehandler.cpp | 2 +- src/appleseed.studio/main/main.cpp | 2 +- .../mainwindow/applicationsettingswindow.cpp | 2 +- .../mainwindow/mainwindow.cpp | 2 +- src/appleseed/CMakeLists.txt | 75 +++++++++++-------- .../foundation/{math => hash}/hash.h | 0 .../{utility => hash}/murmurhash.cpp | 0 .../foundation/{utility => hash}/murmurhash.h | 0 .../foundation/{utility => hash}/siphash.cpp | 0 .../foundation/{utility => hash}/siphash.h | 0 src/appleseed/foundation/image/color.h | 2 +- .../{utility => }/log/consolelogtarget.cpp | 4 +- .../{utility => }/log/consolelogtarget.h | 0 .../{utility => }/log/filelogtarget.cpp | 0 .../{utility => }/log/filelogtarget.h | 4 +- .../{utility => }/log/filelogtargetbase.cpp | 0 .../{utility => }/log/filelogtargetbase.h | 4 +- .../foundation/{utility => }/log/helpers.h | 4 +- .../foundation/{utility => }/log/ilogtarget.h | 2 +- .../foundation/{utility => log}/log.h | 20 ++--- .../{utility => }/log/logformatter.cpp | 2 +- .../{utility => }/log/logformatter.h | 0 .../foundation/{utility => }/log/logger.cpp | 2 +- .../foundation/{utility => }/log/logger.h | 2 +- .../{utility => }/log/logmessage.cpp | 0 .../foundation/{utility => }/log/logmessage.h | 0 .../{utility => }/log/openfilelogtarget.cpp | 4 +- .../{utility => }/log/openfilelogtarget.h | 0 .../{utility => }/log/stringlogtarget.cpp | 0 .../{utility => }/log/stringlogtarget.h | 4 +- .../foundation/math/bsp/bsp_statistics.h | 2 +- .../foundation/math/voxel/voxel_statistics.h | 2 +- .../meta/benchmarks/benchmark_hash.cpp | 4 +- .../meta/benchmarks/benchmark_job.cpp | 2 +- .../meta/benchmarks/benchmark_knn.cpp | 2 +- .../foundation/meta/tests/test_hash.cpp | 6 +- .../foundation/meta/tests/test_hashtable.cpp | 4 +- .../foundation/meta/tests/test_job.cpp | 2 +- .../foundation/meta/tests/test_murmurhash.cpp | 4 +- .../foundation/meta/tests/test_settings.cpp | 2 +- .../foundation/meta/tests/test_siphash.cpp | 4 +- src/appleseed/foundation/platform/system.cpp | 2 +- src/appleseed/foundation/platform/thread.cpp | 2 +- .../benchmark/loggerbenchmarklistener.cpp | 2 +- .../commandlineparser/commandlineparser.h | 2 +- .../commandlineparser/flagoptionhandler.h | 2 +- .../utility/commandlineparser/messagelist.h | 2 +- .../commandlineparser/valueoptionhandler.h | 2 +- .../foundation/utility/job/jobmanager.cpp | 2 +- .../foundation/utility/job/workerthread.cpp | 2 +- .../utility/test/loggertestlistener.cpp | 2 +- src/appleseed/foundation/utility/xercesc.h | 2 +- src/appleseed/renderer/global/globallogger.h | 2 +- .../kernel/intersection/assemblytree.cpp | 2 +- .../renderer/kernel/lighting/lightsample.h | 2 +- .../lighttracingsamplegenerator.cpp | 2 +- .../kernel/lighting/sppm/sppmpasscallback.cpp | 2 +- .../kernel/lighting/sppm/sppmphotontracer.cpp | 2 +- .../final/texturecontrolledpixelrenderer.cpp | 2 +- .../rendering/final/uniformpixelrenderer.cpp | 2 +- .../generic/genericframerenderer.cpp | 2 +- .../rendering/generic/generictilerenderer.cpp | 2 +- .../renderer/kernel/texturing/texturestore.h | 2 +- .../renderer/modeling/entity/entity.h | 2 +- .../renderer/modeling/input/scalarsource.h | 2 +- .../renderer/modeling/input/texturesource.cpp | 2 +- .../modeling/object/meshobjectoperations.cpp | 2 +- .../modeling/project/projectfilereader.cpp | 2 +- .../modeling/project/projecttracker.cpp | 6 +- .../surfaceshader/diagnosticsurfaceshader.cpp | 2 +- src/tools/animatecamera/animationpath.cpp | 2 +- .../animatecamera/commandlinehandler.cpp | 2 +- src/tools/animatecamera/main.cpp | 2 +- .../convertmeshfile/commandlinehandler.cpp | 2 +- src/tools/convertmeshfile/main.cpp | 2 +- src/tools/dumpmetadata/commandlinehandler.cpp | 2 +- src/tools/dumpmetadata/main.cpp | 2 +- src/tools/makefluffy/commandlinehandler.cpp | 2 +- src/tools/projecttool/commandlinehandler.cpp | 2 +- 96 files changed, 149 insertions(+), 140 deletions(-) rename src/appleseed/foundation/{math => hash}/hash.h (100%) rename src/appleseed/foundation/{utility => hash}/murmurhash.cpp (100%) rename src/appleseed/foundation/{utility => hash}/murmurhash.h (100%) rename src/appleseed/foundation/{utility => hash}/siphash.cpp (100%) rename src/appleseed/foundation/{utility => hash}/siphash.h (100%) rename src/appleseed/foundation/{utility => }/log/consolelogtarget.cpp (97%) rename src/appleseed/foundation/{utility => }/log/consolelogtarget.h (100%) rename src/appleseed/foundation/{utility => }/log/filelogtarget.cpp (100%) rename src/appleseed/foundation/{utility => }/log/filelogtarget.h (96%) rename src/appleseed/foundation/{utility => }/log/filelogtargetbase.cpp (100%) rename src/appleseed/foundation/{utility => }/log/filelogtargetbase.h (95%) rename src/appleseed/foundation/{utility => }/log/helpers.h (97%) rename src/appleseed/foundation/{utility => }/log/ilogtarget.h (97%) rename src/appleseed/foundation/{utility => log}/log.h (74%) rename src/appleseed/foundation/{utility => }/log/logformatter.cpp (97%) rename src/appleseed/foundation/{utility => }/log/logformatter.h (100%) rename src/appleseed/foundation/{utility => }/log/logger.cpp (99%) rename src/appleseed/foundation/{utility => }/log/logger.h (98%) rename src/appleseed/foundation/{utility => }/log/logmessage.cpp (100%) rename src/appleseed/foundation/{utility => }/log/logmessage.h (100%) rename src/appleseed/foundation/{utility => }/log/openfilelogtarget.cpp (96%) rename src/appleseed/foundation/{utility => }/log/openfilelogtarget.h (100%) rename src/appleseed/foundation/{utility => }/log/stringlogtarget.cpp (100%) rename src/appleseed/foundation/{utility => }/log/stringlogtarget.h (96%) diff --git a/sandbox/examples/cpp/distancefieldobject/distancefieldobject.cpp b/sandbox/examples/cpp/distancefieldobject/distancefieldobject.cpp index bd6a3875a7..4568e8a16e 100644 --- a/sandbox/examples/cpp/distancefieldobject/distancefieldobject.cpp +++ b/sandbox/examples/cpp/distancefieldobject/distancefieldobject.cpp @@ -37,7 +37,7 @@ #include "renderer/kernel/shading/shadingray.h" // appleseed.foundation headers. -#include "foundation/math/hash.h" +#include "foundation/hash/hash.h" #include "foundation/math/intersection/rayaabb.h" #include "foundation/math/ray.h" #include "foundation/math/rng/distribution.h" diff --git a/sandbox/examples/cpp/heightfield/heightfield.cpp b/sandbox/examples/cpp/heightfield/heightfield.cpp index 7b63d0c8bd..39965b4370 100644 --- a/sandbox/examples/cpp/heightfield/heightfield.cpp +++ b/sandbox/examples/cpp/heightfield/heightfield.cpp @@ -56,7 +56,7 @@ #include "foundation/platform/compiler.h" #include "foundation/platform/types.h" #include "foundation/containers/dictionary.h" -#include "foundation/utility/log/consolelogtarget.h" +#include "foundation/log/consolelogtarget.h" #include "foundation/utility/searchpaths.h" #include "foundation/utility/string.h" diff --git a/sandbox/examples/cpp/helloworld/helloworld.cpp b/sandbox/examples/cpp/helloworld/helloworld.cpp index 79a50af649..5ea135a777 100644 --- a/sandbox/examples/cpp/helloworld/helloworld.cpp +++ b/sandbox/examples/cpp/helloworld/helloworld.cpp @@ -53,7 +53,7 @@ #include "foundation/math/vector.h" #include "foundation/memory/autoreleaseptr.h" #include "foundation/containers/dictionary.h" -#include "foundation/utility/log/consolelogtarget.h" +#include "foundation/log/consolelogtarget.h" #include "foundation/utility/searchpaths.h" // Standard headers. @@ -282,7 +282,7 @@ int main() { // Create a log target that outputs to stderr, and binds it to the renderer's global logger. // Eventually you will probably want to redirect log messages to your own target. For this - // you will need to implement foundation::ILogTarget (foundation/utility/log/ilogtarget.h). + // you will need to implement foundation::ILogTarget (foundation/log/ilogtarget.h). std::unique_ptr log_target(asf::create_console_log_target(stderr)); asr::global_logger().add_target(log_target.get()); diff --git a/src/appleseed.bench/main/main.cpp b/src/appleseed.bench/main/main.cpp index 68bea1e7e5..51d34eb967 100644 --- a/src/appleseed.bench/main/main.cpp +++ b/src/appleseed.bench/main/main.cpp @@ -40,8 +40,8 @@ // appleseed.foundation headers. #include "foundation/core/appleseed.h" +#include "foundation/log/log.h" #include "foundation/platform/path.h" -#include "foundation/utility/log.h" #include "foundation/utility/preprocessor.h" // appleseed.main headers. diff --git a/src/appleseed.bench/mainwindow/applicationsettingswindow.cpp b/src/appleseed.bench/mainwindow/applicationsettingswindow.cpp index 776b76e35b..b0ce31ce11 100644 --- a/src/appleseed.bench/mainwindow/applicationsettingswindow.cpp +++ b/src/appleseed.bench/mainwindow/applicationsettingswindow.cpp @@ -42,8 +42,8 @@ #include "renderer/api/utility.h" // appleseed.foundation headers. +#include "foundation/log/logmessage.h" #include "foundation/platform/system.h" -#include "foundation/utility/log/logmessage.h" #include "foundation/utility/string.h" // Qt headers. diff --git a/src/appleseed.bench/mainwindow/mainwindow.cpp b/src/appleseed.bench/mainwindow/mainwindow.cpp index 31b070ea7c..5e2ff97993 100644 --- a/src/appleseed.bench/mainwindow/mainwindow.cpp +++ b/src/appleseed.bench/mainwindow/mainwindow.cpp @@ -58,10 +58,10 @@ // appleseed.foundation headers. #include "foundation/containers/dictionary.h" #include "foundation/core/appleseed.h" +#include "foundation/log/logmessage.h" #include "foundation/platform/compiler.h" #include "foundation/platform/path.h" #include "foundation/platform/system.h" -#include "foundation/utility/log/logmessage.h" #include "foundation/utility/string.h" // Qt headers. diff --git a/src/appleseed.cli/commandlinehandler.cpp b/src/appleseed.cli/commandlinehandler.cpp index 4bc7c5d9d5..f896cc890f 100644 --- a/src/appleseed.cli/commandlinehandler.cpp +++ b/src/appleseed.cli/commandlinehandler.cpp @@ -34,7 +34,7 @@ #include "application/superlogger.h" // appleseed.foundation headers. -#include "foundation/utility/log.h" +#include "foundation/log/log.h" using namespace appleseed::common; using namespace foundation; diff --git a/src/appleseed.cli/main.cpp b/src/appleseed.cli/main.cpp index a3838ee2c7..e353a87104 100644 --- a/src/appleseed.cli/main.cpp +++ b/src/appleseed.cli/main.cpp @@ -48,13 +48,13 @@ #include "renderer/api/utility.h" // appleseed.foundation headers. +#include "foundation/log/log.h" #include "foundation/memory/autoreleaseptr.h" #include "foundation/platform/console.h" #include "foundation/platform/debugger.h" #include "foundation/platform/thread.h" #include "foundation/utility/benchmark.h" #include "foundation/utility/filter.h" -#include "foundation/utility/log.h" #include "foundation/utility/searchpaths.h" #include "foundation/utility/string.h" #include "foundation/utility/test.h" diff --git a/src/appleseed.common/application/application.cpp b/src/appleseed.common/application/application.cpp index 190ce37dd6..50b1327a4c 100644 --- a/src/appleseed.common/application/application.cpp +++ b/src/appleseed.common/application/application.cpp @@ -32,9 +32,9 @@ // appleseed.foundation headers. #include "foundation/containers/dictionary.h" +#include "foundation/log/log.h" #include "foundation/platform/path.h" #include "foundation/platform/system.h" -#include "foundation/utility/log.h" #include "foundation/utility/searchpaths.h" #include "foundation/utility/settings.h" #include "foundation/utility/string.h" diff --git a/src/appleseed.common/application/application.h b/src/appleseed.common/application/application.h index 180cb7f155..a1aa24734a 100644 --- a/src/appleseed.common/application/application.h +++ b/src/appleseed.common/application/application.h @@ -30,7 +30,7 @@ #pragma once // appleseed.foundation headers. -#include "foundation/utility/log/logmessage.h" +#include "foundation/log/logmessage.h" // Boost headers. #include "boost/filesystem/operations.hpp" diff --git a/src/appleseed.common/application/commandlinehandlerbase.cpp b/src/appleseed.common/application/commandlinehandlerbase.cpp index ec64f3d607..71e441f9ea 100644 --- a/src/appleseed.common/application/commandlinehandlerbase.cpp +++ b/src/appleseed.common/application/commandlinehandlerbase.cpp @@ -36,6 +36,7 @@ // appleseed.foundation headers. #include "foundation/core/appleseed.h" #include "foundation/core/thirdparties.h" +#include "foundation/log/log.h" #include "foundation/platform/compiler.h" #include "foundation/platform/system.h" #include "foundation/platform/types.h" @@ -43,7 +44,6 @@ #include "foundation/platform/windows.h" #endif #include "foundation/utility/commandlineparser.h" -#include "foundation/utility/log.h" // Boost headers. #include "boost/filesystem/path.hpp" diff --git a/src/appleseed.common/application/progresstilecallback.cpp b/src/appleseed.common/application/progresstilecallback.cpp index 098f5b28f0..d8d037a98b 100644 --- a/src/appleseed.common/application/progresstilecallback.cpp +++ b/src/appleseed.common/application/progresstilecallback.cpp @@ -37,9 +37,9 @@ #include "foundation/image/canvasproperties.h" #include "foundation/image/image.h" #include "foundation/image/tile.h" +#include "foundation/log/log.h" #include "foundation/platform/defaulttimers.h" #include "foundation/platform/thread.h" -#include "foundation/utility/log.h" #include "foundation/utility/stopwatch.h" #include "foundation/utility/string.h" @@ -117,7 +117,7 @@ namespace "rendering, %s done; about %s remaining...", pretty_percent(m_rendered_pixels, total_pixels).c_str(), pretty_time(remaining_time).c_str()); - } + } } private: diff --git a/src/appleseed.common/application/superlogger.h b/src/appleseed.common/application/superlogger.h index 1348820f7f..a80e91888f 100644 --- a/src/appleseed.common/application/superlogger.h +++ b/src/appleseed.common/application/superlogger.h @@ -30,7 +30,7 @@ #pragma once // appleseed.foundation headers. -#include "foundation/utility/log.h" +#include "foundation/log/log.h" // Forward declarations. namespace foundation { class Dictionary; } diff --git a/src/appleseed.python/bindlogger.cpp b/src/appleseed.python/bindlogger.cpp index e0e1d95815..c68bc9a425 100644 --- a/src/appleseed.python/bindlogger.cpp +++ b/src/appleseed.python/bindlogger.cpp @@ -34,9 +34,9 @@ #include "renderer/global/globallogger.h" // appleseed.foundation headers. +#include "foundation/log/log.h" #include "foundation/platform/compiler.h" #include "foundation/platform/python.h" -#include "foundation/utility/log.h" // Standard headers. #include diff --git a/src/appleseed.python/bindmeshobject.cpp b/src/appleseed.python/bindmeshobject.cpp index 88ef4ed14b..84b9b03710 100644 --- a/src/appleseed.python/bindmeshobject.cpp +++ b/src/appleseed.python/bindmeshobject.cpp @@ -35,8 +35,8 @@ #include "renderer/api/object.h" // appleseed.foundation headers. +#include "foundation/hash/murmurhash.h" #include "foundation/platform/python.h" -#include "foundation/utility/murmurhash.h" #include "foundation/utility/searchpaths.h" // Standard headers. diff --git a/src/appleseed.python/bindmurmurhash.cpp b/src/appleseed.python/bindmurmurhash.cpp index 0f76bd0693..a0bb5bc4cd 100644 --- a/src/appleseed.python/bindmurmurhash.cpp +++ b/src/appleseed.python/bindmurmurhash.cpp @@ -27,8 +27,8 @@ // // appleseed.foundation headers. +#include "foundation/hash/murmurhash.h" #include "foundation/platform/python.h" -#include "foundation/utility/murmurhash.h" // Standard headers. #include diff --git a/src/appleseed.qtcommon/widgets/qtlogtarget.h b/src/appleseed.qtcommon/widgets/qtlogtarget.h index 983a6c5c4f..391e09cd17 100644 --- a/src/appleseed.qtcommon/widgets/qtlogtarget.h +++ b/src/appleseed.qtcommon/widgets/qtlogtarget.h @@ -30,7 +30,7 @@ #pragma once // appleseed.foundation headers. -#include "foundation/utility/log.h" +#include "foundation/log/log.h" // Qt headers. #include diff --git a/src/appleseed.studio/main/commandlinehandler.cpp b/src/appleseed.studio/main/commandlinehandler.cpp index a906509333..a81796ec98 100644 --- a/src/appleseed.studio/main/commandlinehandler.cpp +++ b/src/appleseed.studio/main/commandlinehandler.cpp @@ -34,7 +34,7 @@ #include "application/superlogger.h" // appleseed.foundation headers. -#include "foundation/utility/log.h" +#include "foundation/log/log.h" // Qt headers. #include diff --git a/src/appleseed.studio/main/main.cpp b/src/appleseed.studio/main/main.cpp index f65f7a7553..2746a9503d 100644 --- a/src/appleseed.studio/main/main.cpp +++ b/src/appleseed.studio/main/main.cpp @@ -41,9 +41,9 @@ // appleseed.foundation headers. #include "foundation/core/appleseed.h" +#include "foundation/log/log.h" #include "foundation/platform/path.h" #include "foundation/platform/python.h" -#include "foundation/utility/log.h" #include "foundation/utility/preprocessor.h" // appleseed.main headers. diff --git a/src/appleseed.studio/mainwindow/applicationsettingswindow.cpp b/src/appleseed.studio/mainwindow/applicationsettingswindow.cpp index 649e414996..f0198b4c9c 100644 --- a/src/appleseed.studio/mainwindow/applicationsettingswindow.cpp +++ b/src/appleseed.studio/mainwindow/applicationsettingswindow.cpp @@ -42,8 +42,8 @@ #include "renderer/api/utility.h" // appleseed.foundation headers. +#include "foundation/log/logmessage.h" #include "foundation/platform/system.h" -#include "foundation/utility/log/logmessage.h" #include "foundation/utility/string.h" // Qt headers. diff --git a/src/appleseed.studio/mainwindow/mainwindow.cpp b/src/appleseed.studio/mainwindow/mainwindow.cpp index df191e191d..380444ed29 100644 --- a/src/appleseed.studio/mainwindow/mainwindow.cpp +++ b/src/appleseed.studio/mainwindow/mainwindow.cpp @@ -64,6 +64,7 @@ // appleseed.foundation headers. #include "foundation/containers/dictionary.h" #include "foundation/core/appleseed.h" +#include "foundation/log/logmessage.h" #include "foundation/math/aabb.h" #include "foundation/math/vector.h" #include "foundation/platform/compiler.h" @@ -71,7 +72,6 @@ #include "foundation/platform/python.h" #include "foundation/platform/system.h" #include "foundation/utility/foreach.h" -#include "foundation/utility/log/logmessage.h" // Qt headers. #include diff --git a/src/appleseed/CMakeLists.txt b/src/appleseed/CMakeLists.txt index a7c07cccfa..0c9cad0009 100644 --- a/src/appleseed/CMakeLists.txt +++ b/src/appleseed/CMakeLists.txt @@ -167,6 +167,20 @@ source_group ("foundation\\curve" FILES ${foundation_curve_sources} ) +set (foundation_hash_sources + foundation/hash/hash.h + foundation/hash/murmurhash.cpp + foundation/hash/murmurhash.h + foundation/hash/siphash.cpp + foundation/hash/siphash.h +) +list (APPEND appleseed_sources + ${foundation_hash_sources} +) +source_group ("foundation\\hash" FILES + ${foundation_hash_sources} +) + set (foundation_image_text_sources foundation/image/text/stb_truetype.cpp foundation/image/text/stb_truetype.h @@ -227,6 +241,34 @@ source_group ("foundation\\image" FILES ${foundation_image_sources} ) +set (foundation_log_sources + foundation/log/consolelogtarget.cpp + foundation/log/consolelogtarget.h + foundation/log/filelogtarget.cpp + foundation/log/filelogtarget.h + foundation/log/filelogtargetbase.cpp + foundation/log/filelogtargetbase.h + foundation/log/helpers.h + foundation/log/ilogtarget.h + foundation/log/log.h + foundation/log/logformatter.cpp + foundation/log/logformatter.h + foundation/log/logger.cpp + foundation/log/logger.h + foundation/log/logmessage.cpp + foundation/log/logmessage.h + foundation/log/openfilelogtarget.cpp + foundation/log/openfilelogtarget.h + foundation/log/stringlogtarget.cpp + foundation/log/stringlogtarget.h +) +list (APPEND appleseed_sources + ${foundation_log_sources} +) +source_group ("foundation\\log" FILES + ${foundation_log_sources} +) + set (foundation_math_bsp_sources foundation/math/bsp/bsp_builder.h foundation/math/bsp/bsp_intersector.h @@ -379,7 +421,6 @@ set (foundation_math_sources foundation/math/frustum.h foundation/math/half.cpp foundation/math/half.h - foundation/math/hash.h foundation/math/knn.h foundation/math/matrix.h foundation/math/microfacet.cpp @@ -815,33 +856,6 @@ source_group ("foundation\\utility\\job" FILES ${foundation_utility_job_sources} ) -set (foundation_utility_log_sources - foundation/utility/log/consolelogtarget.cpp - foundation/utility/log/consolelogtarget.h - foundation/utility/log/filelogtarget.cpp - foundation/utility/log/filelogtarget.h - foundation/utility/log/filelogtargetbase.cpp - foundation/utility/log/filelogtargetbase.h - foundation/utility/log/helpers.h - foundation/utility/log/ilogtarget.h - foundation/utility/log/logformatter.cpp - foundation/utility/log/logformatter.h - foundation/utility/log/logger.cpp - foundation/utility/log/logger.h - foundation/utility/log/logmessage.cpp - foundation/utility/log/logmessage.h - foundation/utility/log/openfilelogtarget.cpp - foundation/utility/log/openfilelogtarget.h - foundation/utility/log/stringlogtarget.cpp - foundation/utility/log/stringlogtarget.h -) -list (APPEND appleseed_sources - ${foundation_utility_log_sources} -) -source_group ("foundation\\utility\\log" FILES - ${foundation_utility_log_sources} -) - set (foundation_utility_minizip_sources foundation/utility/minizip/crypt.h foundation/utility/minizip/ioapi.c @@ -938,10 +952,7 @@ set (foundation_utility_sources foundation/utility/job.h foundation/utility/kvpair.h foundation/utility/lazy.h - foundation/utility/log.h foundation/utility/makevector.h - foundation/utility/murmurhash.cpp - foundation/utility/murmurhash.h foundation/utility/numerictype.h foundation/utility/otherwise.h foundation/utility/poison.h @@ -951,8 +962,6 @@ set (foundation_utility_sources foundation/utility/searchpaths.cpp foundation/utility/searchpaths.h foundation/utility/settings.h - foundation/utility/siphash.cpp - foundation/utility/siphash.h foundation/utility/statistics.cpp foundation/utility/statistics.h foundation/utility/stopwatch.h diff --git a/src/appleseed/foundation/math/hash.h b/src/appleseed/foundation/hash/hash.h similarity index 100% rename from src/appleseed/foundation/math/hash.h rename to src/appleseed/foundation/hash/hash.h diff --git a/src/appleseed/foundation/utility/murmurhash.cpp b/src/appleseed/foundation/hash/murmurhash.cpp similarity index 100% rename from src/appleseed/foundation/utility/murmurhash.cpp rename to src/appleseed/foundation/hash/murmurhash.cpp diff --git a/src/appleseed/foundation/utility/murmurhash.h b/src/appleseed/foundation/hash/murmurhash.h similarity index 100% rename from src/appleseed/foundation/utility/murmurhash.h rename to src/appleseed/foundation/hash/murmurhash.h diff --git a/src/appleseed/foundation/utility/siphash.cpp b/src/appleseed/foundation/hash/siphash.cpp similarity index 100% rename from src/appleseed/foundation/utility/siphash.cpp rename to src/appleseed/foundation/hash/siphash.cpp diff --git a/src/appleseed/foundation/utility/siphash.h b/src/appleseed/foundation/hash/siphash.h similarity index 100% rename from src/appleseed/foundation/utility/siphash.h rename to src/appleseed/foundation/hash/siphash.h diff --git a/src/appleseed/foundation/image/color.h b/src/appleseed/foundation/image/color.h index a9209784f4..47ba2eed06 100644 --- a/src/appleseed/foundation/image/color.h +++ b/src/appleseed/foundation/image/color.h @@ -30,8 +30,8 @@ #pragma once // appleseed.foundation headers. +#include "foundation/hash/hash.h" #include "foundation/math/fp.h" -#include "foundation/math/hash.h" #include "foundation/math/matrix.h" #include "foundation/math/scalar.h" #include "foundation/utility/poison.h" diff --git a/src/appleseed/foundation/utility/log/consolelogtarget.cpp b/src/appleseed/foundation/log/consolelogtarget.cpp similarity index 97% rename from src/appleseed/foundation/utility/log/consolelogtarget.cpp rename to src/appleseed/foundation/log/consolelogtarget.cpp index 34645f8400..e1592cb01d 100644 --- a/src/appleseed/foundation/utility/log/consolelogtarget.cpp +++ b/src/appleseed/foundation/log/consolelogtarget.cpp @@ -31,10 +31,10 @@ #include "consolelogtarget.h" // appleseed.foundation headers. +#include "foundation/log/filelogtargetbase.h" +#include "foundation/log/logmessage.h" #include "foundation/platform/compiler.h" #include "foundation/platform/console.h" -#include "foundation/utility/log/filelogtargetbase.h" -#include "foundation/utility/log/logmessage.h" // Standard headers. #include diff --git a/src/appleseed/foundation/utility/log/consolelogtarget.h b/src/appleseed/foundation/log/consolelogtarget.h similarity index 100% rename from src/appleseed/foundation/utility/log/consolelogtarget.h rename to src/appleseed/foundation/log/consolelogtarget.h diff --git a/src/appleseed/foundation/utility/log/filelogtarget.cpp b/src/appleseed/foundation/log/filelogtarget.cpp similarity index 100% rename from src/appleseed/foundation/utility/log/filelogtarget.cpp rename to src/appleseed/foundation/log/filelogtarget.cpp diff --git a/src/appleseed/foundation/utility/log/filelogtarget.h b/src/appleseed/foundation/log/filelogtarget.h similarity index 96% rename from src/appleseed/foundation/utility/log/filelogtarget.h rename to src/appleseed/foundation/log/filelogtarget.h index fe4973e3b0..09637d67b9 100644 --- a/src/appleseed/foundation/utility/log/filelogtarget.h +++ b/src/appleseed/foundation/log/filelogtarget.h @@ -30,9 +30,9 @@ #pragma once // appleseed.foundation headers. +#include "foundation/log/filelogtargetbase.h" +#include "foundation/log/logmessage.h" #include "foundation/platform/compiler.h" -#include "foundation/utility/log/filelogtargetbase.h" -#include "foundation/utility/log/logmessage.h" // appleseed.main headers. #include "main/dllsymbol.h" diff --git a/src/appleseed/foundation/utility/log/filelogtargetbase.cpp b/src/appleseed/foundation/log/filelogtargetbase.cpp similarity index 100% rename from src/appleseed/foundation/utility/log/filelogtargetbase.cpp rename to src/appleseed/foundation/log/filelogtargetbase.cpp diff --git a/src/appleseed/foundation/utility/log/filelogtargetbase.h b/src/appleseed/foundation/log/filelogtargetbase.h similarity index 95% rename from src/appleseed/foundation/utility/log/filelogtargetbase.h rename to src/appleseed/foundation/log/filelogtargetbase.h index 77b66a243e..81132d2677 100644 --- a/src/appleseed/foundation/utility/log/filelogtargetbase.h +++ b/src/appleseed/foundation/log/filelogtargetbase.h @@ -30,8 +30,8 @@ #pragma once // appleseed.foundation headers. -#include "foundation/utility/log/ilogtarget.h" -#include "foundation/utility/log/logmessage.h" +#include "foundation/log/ilogtarget.h" +#include "foundation/log/logmessage.h" // appleseed.main headers. #include "main/dllsymbol.h" diff --git a/src/appleseed/foundation/utility/log/helpers.h b/src/appleseed/foundation/log/helpers.h similarity index 97% rename from src/appleseed/foundation/utility/log/helpers.h rename to src/appleseed/foundation/log/helpers.h index c3cf773084..2ffff7dcbc 100644 --- a/src/appleseed/foundation/utility/log/helpers.h +++ b/src/appleseed/foundation/log/helpers.h @@ -30,8 +30,8 @@ #pragma once // appleseed.foundation headers. -#include "foundation/utility/log/logger.h" -#include "foundation/utility/log/logmessage.h" +#include "foundation/log/logger.h" +#include "foundation/log/logmessage.h" namespace foundation { diff --git a/src/appleseed/foundation/utility/log/ilogtarget.h b/src/appleseed/foundation/log/ilogtarget.h similarity index 97% rename from src/appleseed/foundation/utility/log/ilogtarget.h rename to src/appleseed/foundation/log/ilogtarget.h index 31fc8098b8..3adb501cc5 100644 --- a/src/appleseed/foundation/utility/log/ilogtarget.h +++ b/src/appleseed/foundation/log/ilogtarget.h @@ -31,7 +31,7 @@ // appleseed.foundation headers. #include "foundation/core/concepts/iunknown.h" -#include "foundation/utility/log/logmessage.h" +#include "foundation/log/logmessage.h" // appleseed.main headers. #include "main/dllsymbol.h" diff --git a/src/appleseed/foundation/utility/log.h b/src/appleseed/foundation/log/log.h similarity index 74% rename from src/appleseed/foundation/utility/log.h rename to src/appleseed/foundation/log/log.h index 6499b4278d..2c53faffe9 100644 --- a/src/appleseed/foundation/utility/log.h +++ b/src/appleseed/foundation/log/log.h @@ -30,13 +30,13 @@ #pragma once // Interface headers. -#include "foundation/utility/log/consolelogtarget.h" -#include "foundation/utility/log/filelogtarget.h" -#include "foundation/utility/log/filelogtargetbase.h" -#include "foundation/utility/log/helpers.h" -#include "foundation/utility/log/ilogtarget.h" -#include "foundation/utility/log/logformatter.h" -#include "foundation/utility/log/logger.h" -#include "foundation/utility/log/logmessage.h" -#include "foundation/utility/log/openfilelogtarget.h" -#include "foundation/utility/log/stringlogtarget.h" +#include "foundation/log/consolelogtarget.h" +#include "foundation/log/filelogtarget.h" +#include "foundation/log/filelogtargetbase.h" +#include "foundation/log/helpers.h" +#include "foundation/log/ilogtarget.h" +#include "foundation/log/logformatter.h" +#include "foundation/log/logger.h" +#include "foundation/log/logmessage.h" +#include "foundation/log/openfilelogtarget.h" +#include "foundation/log/stringlogtarget.h" diff --git a/src/appleseed/foundation/utility/log/logformatter.cpp b/src/appleseed/foundation/log/logformatter.cpp similarity index 97% rename from src/appleseed/foundation/utility/log/logformatter.cpp rename to src/appleseed/foundation/log/logformatter.cpp index 4fccbeb88b..23d6b0a402 100644 --- a/src/appleseed/foundation/utility/log/logformatter.cpp +++ b/src/appleseed/foundation/log/logformatter.cpp @@ -31,7 +31,7 @@ #include "logformatter.h" // appleseed.foundation headers. -#include "foundation/utility/log/logger.h" +#include "foundation/log/logger.h" namespace foundation { diff --git a/src/appleseed/foundation/utility/log/logformatter.h b/src/appleseed/foundation/log/logformatter.h similarity index 100% rename from src/appleseed/foundation/utility/log/logformatter.h rename to src/appleseed/foundation/log/logformatter.h diff --git a/src/appleseed/foundation/utility/log/logger.cpp b/src/appleseed/foundation/log/logger.cpp similarity index 99% rename from src/appleseed/foundation/utility/log/logger.cpp rename to src/appleseed/foundation/log/logger.cpp index 7b80d67448..aff55668cc 100644 --- a/src/appleseed/foundation/utility/log/logger.cpp +++ b/src/appleseed/foundation/log/logger.cpp @@ -31,12 +31,12 @@ #include "logger.h" // appleseed.foundation headers. +#include "foundation/log/ilogtarget.h" #include "foundation/platform/compiler.h" #include "foundation/platform/snprintf.h" #include "foundation/platform/system.h" #include "foundation/platform/thread.h" #include "foundation/utility/foreach.h" -#include "foundation/utility/log/ilogtarget.h" #include "foundation/utility/string.h" // Boost headers. diff --git a/src/appleseed/foundation/utility/log/logger.h b/src/appleseed/foundation/log/logger.h similarity index 98% rename from src/appleseed/foundation/utility/log/logger.h rename to src/appleseed/foundation/log/logger.h index ae3072c17b..97cb5d076f 100644 --- a/src/appleseed/foundation/utility/log/logger.h +++ b/src/appleseed/foundation/log/logger.h @@ -31,8 +31,8 @@ // appleseed.foundation headers. #include "foundation/core/concepts/noncopyable.h" +#include "foundation/log/logmessage.h" #include "foundation/platform/compiler.h" -#include "foundation/utility/log/logmessage.h" // appleseed.main headers. #include "main/dllsymbol.h" diff --git a/src/appleseed/foundation/utility/log/logmessage.cpp b/src/appleseed/foundation/log/logmessage.cpp similarity index 100% rename from src/appleseed/foundation/utility/log/logmessage.cpp rename to src/appleseed/foundation/log/logmessage.cpp diff --git a/src/appleseed/foundation/utility/log/logmessage.h b/src/appleseed/foundation/log/logmessage.h similarity index 100% rename from src/appleseed/foundation/utility/log/logmessage.h rename to src/appleseed/foundation/log/logmessage.h diff --git a/src/appleseed/foundation/utility/log/openfilelogtarget.cpp b/src/appleseed/foundation/log/openfilelogtarget.cpp similarity index 96% rename from src/appleseed/foundation/utility/log/openfilelogtarget.cpp rename to src/appleseed/foundation/log/openfilelogtarget.cpp index eeb58bb12e..4e84312fa5 100644 --- a/src/appleseed/foundation/utility/log/openfilelogtarget.cpp +++ b/src/appleseed/foundation/log/openfilelogtarget.cpp @@ -31,9 +31,9 @@ #include "openfilelogtarget.h" // appleseed.foundation headers. +#include "foundation/log/filelogtargetbase.h" +#include "foundation/log/logmessage.h" #include "foundation/platform/compiler.h" -#include "foundation/utility/log/filelogtargetbase.h" -#include "foundation/utility/log/logmessage.h" // Standard headers. #include diff --git a/src/appleseed/foundation/utility/log/openfilelogtarget.h b/src/appleseed/foundation/log/openfilelogtarget.h similarity index 100% rename from src/appleseed/foundation/utility/log/openfilelogtarget.h rename to src/appleseed/foundation/log/openfilelogtarget.h diff --git a/src/appleseed/foundation/utility/log/stringlogtarget.cpp b/src/appleseed/foundation/log/stringlogtarget.cpp similarity index 100% rename from src/appleseed/foundation/utility/log/stringlogtarget.cpp rename to src/appleseed/foundation/log/stringlogtarget.cpp diff --git a/src/appleseed/foundation/utility/log/stringlogtarget.h b/src/appleseed/foundation/log/stringlogtarget.h similarity index 96% rename from src/appleseed/foundation/utility/log/stringlogtarget.h rename to src/appleseed/foundation/log/stringlogtarget.h index b0143970a9..97210e061f 100644 --- a/src/appleseed/foundation/utility/log/stringlogtarget.h +++ b/src/appleseed/foundation/log/stringlogtarget.h @@ -30,9 +30,9 @@ #pragma once // appleseed.foundation headers. +#include "foundation/log/ilogtarget.h" +#include "foundation/log/logmessage.h" #include "foundation/platform/compiler.h" -#include "foundation/utility/log/ilogtarget.h" -#include "foundation/utility/log/logmessage.h" // appleseed.main headers. #include "main/dllsymbol.h" diff --git a/src/appleseed/foundation/math/bsp/bsp_statistics.h b/src/appleseed/foundation/math/bsp/bsp_statistics.h index fc79e850d1..33e3b50944 100644 --- a/src/appleseed/foundation/math/bsp/bsp_statistics.h +++ b/src/appleseed/foundation/math/bsp/bsp_statistics.h @@ -31,9 +31,9 @@ // appleseed.foundation headers. #include "foundation/core/concepts/noncopyable.h" +#include "foundation/log/log.h" #include "foundation/math/population.h" #include "foundation/math/split.h" -#include "foundation/utility/log.h" #include "foundation/utility/string.h" // Standard headers. diff --git a/src/appleseed/foundation/math/voxel/voxel_statistics.h b/src/appleseed/foundation/math/voxel/voxel_statistics.h index de20694598..6d1d6a3763 100644 --- a/src/appleseed/foundation/math/voxel/voxel_statistics.h +++ b/src/appleseed/foundation/math/voxel/voxel_statistics.h @@ -31,9 +31,9 @@ // appleseed.foundation headers. #include "foundation/core/concepts/noncopyable.h" +#include "foundation/log/log.h" #include "foundation/math/population.h" #include "foundation/math/split.h" -#include "foundation/utility/log.h" #include "foundation/utility/string.h" // Standard headers. diff --git a/src/appleseed/foundation/meta/benchmarks/benchmark_hash.cpp b/src/appleseed/foundation/meta/benchmarks/benchmark_hash.cpp index c78d6010e4..e25edcfe17 100644 --- a/src/appleseed/foundation/meta/benchmarks/benchmark_hash.cpp +++ b/src/appleseed/foundation/meta/benchmarks/benchmark_hash.cpp @@ -27,7 +27,7 @@ // // appleseed.foundation headers. -#include "foundation/math/hash.h" +#include "foundation/hash/hash.h" #include "foundation/utility/benchmark.h" // Standard headers. @@ -35,7 +35,7 @@ using namespace foundation; -BENCHMARK_SUITE(Foundation_Math_Hash) +BENCHMARK_SUITE(Foundation_Hash_Hash) { const std::uint32_t N = 1000; diff --git a/src/appleseed/foundation/meta/benchmarks/benchmark_job.cpp b/src/appleseed/foundation/meta/benchmarks/benchmark_job.cpp index 4cd91c0d28..cb6f2dae92 100644 --- a/src/appleseed/foundation/meta/benchmarks/benchmark_job.cpp +++ b/src/appleseed/foundation/meta/benchmarks/benchmark_job.cpp @@ -28,9 +28,9 @@ // // appleseed.foundation headers. +#include "foundation/log/log.h" #include "foundation/utility/benchmark.h" #include "foundation/utility/job.h" -#include "foundation/utility/log.h" // Standard headers. #include diff --git a/src/appleseed/foundation/meta/benchmarks/benchmark_knn.cpp b/src/appleseed/foundation/meta/benchmarks/benchmark_knn.cpp index 45bc40a794..ae3275236a 100644 --- a/src/appleseed/foundation/meta/benchmarks/benchmark_knn.cpp +++ b/src/appleseed/foundation/meta/benchmarks/benchmark_knn.cpp @@ -28,6 +28,7 @@ // // appleseed.foundation headers. +#include "foundation/log/log.h" #include "foundation/math/aabb.h" #include "foundation/math/knn.h" #include "foundation/math/rng/distribution.h" @@ -38,7 +39,6 @@ #include "foundation/platform/timers.h" #include "foundation/utility/benchmark.h" #include "foundation/utility/bufferedfile.h" -#include "foundation/utility/log.h" #include "foundation/utility/statistics.h" #include "foundation/utility/string.h" diff --git a/src/appleseed/foundation/meta/tests/test_hash.cpp b/src/appleseed/foundation/meta/tests/test_hash.cpp index 895f648920..334b5d868a 100644 --- a/src/appleseed/foundation/meta/tests/test_hash.cpp +++ b/src/appleseed/foundation/meta/tests/test_hash.cpp @@ -27,6 +27,7 @@ // // appleseed.foundation headers. +#include "foundation/hash/hash.h" #include "foundation/image/color.h" #include "foundation/image/colormap.h" #include "foundation/image/colormapdata.h" @@ -34,7 +35,6 @@ #include "foundation/image/genericimagefilewriter.h" #include "foundation/image/image.h" #include "foundation/image/pixel.h" -#include "foundation/math/hash.h" #include "foundation/math/rng/xoroshiro128plus.h" #include "foundation/math/scalar.h" #include "foundation/math/vector.h" @@ -50,7 +50,7 @@ using namespace foundation; -TEST_SUITE(Foundation_Math_Hash) +TEST_SUITE(Foundation_Hash_Hash) { struct HistogramFixture { @@ -419,7 +419,7 @@ TEST_SUITE(Foundation_Math_Hash) static std::uint32_t boost_hash_combine(const std::uint32_t h1, const std::uint32_t h2) { - // See foundation::combine_hashes() in foundation/math/hash.h for the constant derivation. + // See foundation::combine_hashes() in foundation/hash/hash.h for the constant derivation. return h1 ^ (h2 + 0x9E3779B9ul + (h1 << 6) + (h1 >> 2)); } diff --git a/src/appleseed/foundation/meta/tests/test_hashtable.cpp b/src/appleseed/foundation/meta/tests/test_hashtable.cpp index f873eb8c26..1970b7985e 100644 --- a/src/appleseed/foundation/meta/tests/test_hashtable.cpp +++ b/src/appleseed/foundation/meta/tests/test_hashtable.cpp @@ -28,7 +28,7 @@ // appleseed.foundation headers. #include "foundation/containers/hashtable.h" -#include "foundation/math/hash.h" +#include "foundation/hash/hash.h" #include "foundation/math/rng/distribution.h" #include "foundation/math/rng/xoroshiro128plus.h" #include "foundation/utility/test.h" @@ -39,7 +39,7 @@ using namespace foundation; -TEST_SUITE(Foundation_Utility_Containers_HashTable) +TEST_SUITE(Foundation_Containers_HashTable) { struct KeyHasher { diff --git a/src/appleseed/foundation/meta/tests/test_job.cpp b/src/appleseed/foundation/meta/tests/test_job.cpp index ba27390825..9b1ec0da32 100644 --- a/src/appleseed/foundation/meta/tests/test_job.cpp +++ b/src/appleseed/foundation/meta/tests/test_job.cpp @@ -28,6 +28,7 @@ // // appleseed.foundation headers. +#include "foundation/log/log.h" #include "foundation/platform/atomic.h" #include "foundation/platform/compiler.h" #include "foundation/platform/timers.h" @@ -36,7 +37,6 @@ #include "foundation/utility/job/jobmanager.h" #include "foundation/utility/job/jobqueue.h" #include "foundation/utility/job/workerthread.h" -#include "foundation/utility/log.h" #include "foundation/utility/test.h" // Standard headers. diff --git a/src/appleseed/foundation/meta/tests/test_murmurhash.cpp b/src/appleseed/foundation/meta/tests/test_murmurhash.cpp index c14f77b1cb..ab014a5c24 100644 --- a/src/appleseed/foundation/meta/tests/test_murmurhash.cpp +++ b/src/appleseed/foundation/meta/tests/test_murmurhash.cpp @@ -27,12 +27,12 @@ // // appleseed.foundation headers. -#include "foundation/utility/murmurhash.h" +#include "foundation/hash/murmurhash.h" #include "foundation/utility/test.h" using namespace foundation; -TEST_SUITE(Foundation_Utility_MurmurHash) +TEST_SUITE(Foundation_Hash_MurmurHash) { TEST_CASE(Append) { diff --git a/src/appleseed/foundation/meta/tests/test_settings.cpp b/src/appleseed/foundation/meta/tests/test_settings.cpp index d52dc14234..0cc4a974d5 100644 --- a/src/appleseed/foundation/meta/tests/test_settings.cpp +++ b/src/appleseed/foundation/meta/tests/test_settings.cpp @@ -32,7 +32,7 @@ #include "foundation/platform/windows.h" #endif #include "foundation/containers/dictionary.h" -#include "foundation/utility/log.h" +#include "foundation/log/log.h" #include "foundation/utility/settings.h" #include "foundation/utility/test.h" #include "foundation/utility/testutils.h" diff --git a/src/appleseed/foundation/meta/tests/test_siphash.cpp b/src/appleseed/foundation/meta/tests/test_siphash.cpp index 5ac3d2a58d..a1094ceb16 100644 --- a/src/appleseed/foundation/meta/tests/test_siphash.cpp +++ b/src/appleseed/foundation/meta/tests/test_siphash.cpp @@ -27,7 +27,7 @@ // // appleseed.foundation headers. -#include "foundation/utility/siphash.h" +#include "foundation/hash/siphash.h" #include "foundation/utility/test.h" // Standard headers. @@ -37,7 +37,7 @@ using namespace foundation; -TEST_SUITE(Foundation_Utility_SipHash) +TEST_SUITE(Foundation_Hash_SipHash) { TEST_CASE(TestVectors) { diff --git a/src/appleseed/foundation/platform/system.cpp b/src/appleseed/foundation/platform/system.cpp index 9e79b517e3..254500bfa1 100644 --- a/src/appleseed/foundation/platform/system.cpp +++ b/src/appleseed/foundation/platform/system.cpp @@ -39,7 +39,7 @@ #include "foundation/platform/defaulttimers.h" #include "foundation/platform/thread.h" #include "foundation/platform/types.h" -#include "foundation/utility/log.h" +#include "foundation/log/log.h" #include "foundation/utility/string.h" // Standard headers. diff --git a/src/appleseed/foundation/platform/thread.cpp b/src/appleseed/foundation/platform/thread.cpp index 392a0da52c..6f255398c2 100644 --- a/src/appleseed/foundation/platform/thread.cpp +++ b/src/appleseed/foundation/platform/thread.cpp @@ -37,7 +37,7 @@ #include "foundation/platform/windows.h" #endif #include "foundation/utility/job/iabortswitch.h" -#include "foundation/utility/log.h" +#include "foundation/log/log.h" // Boost headers. #include "boost/chrono.hpp" diff --git a/src/appleseed/foundation/utility/benchmark/loggerbenchmarklistener.cpp b/src/appleseed/foundation/utility/benchmark/loggerbenchmarklistener.cpp index 04c40d129f..8ba5174922 100644 --- a/src/appleseed/foundation/utility/benchmark/loggerbenchmarklistener.cpp +++ b/src/appleseed/foundation/utility/benchmark/loggerbenchmarklistener.cpp @@ -31,13 +31,13 @@ #include "loggerbenchmarklistener.h" // appleseed.foundation headers. +#include "foundation/log/log.h" #include "foundation/platform/types.h" #include "foundation/utility/benchmark/benchmarklistenerbase.h" #include "foundation/utility/benchmark/benchmarksuite.h" #include "foundation/utility/benchmark/ibenchmarkcase.h" #include "foundation/utility/benchmark/timingresult.h" #include "foundation/utility/foreach.h" -#include "foundation/utility/log.h" #include "foundation/utility/string.h" #include "foundation/utility/test.h" diff --git a/src/appleseed/foundation/utility/commandlineparser/commandlineparser.h b/src/appleseed/foundation/utility/commandlineparser/commandlineparser.h index 65824c25cc..55cd6024df 100644 --- a/src/appleseed/foundation/utility/commandlineparser/commandlineparser.h +++ b/src/appleseed/foundation/utility/commandlineparser/commandlineparser.h @@ -31,13 +31,13 @@ // appleseed.foundation headers. #include "foundation/core/concepts/noncopyable.h" +#include "foundation/log/log.h" #include "foundation/utility/commandlineparser/flagoptionhandler.h" #include "foundation/utility/commandlineparser/messagelist.h" #include "foundation/utility/commandlineparser/optionhandler.h" #include "foundation/utility/commandlineparser/parseresults.h" #include "foundation/utility/commandlineparser/valueoptionhandler.h" #include "foundation/utility/foreach.h" -#include "foundation/utility/log.h" // Standard headers. #include diff --git a/src/appleseed/foundation/utility/commandlineparser/flagoptionhandler.h b/src/appleseed/foundation/utility/commandlineparser/flagoptionhandler.h index 4b136e0ed7..7d65a06375 100644 --- a/src/appleseed/foundation/utility/commandlineparser/flagoptionhandler.h +++ b/src/appleseed/foundation/utility/commandlineparser/flagoptionhandler.h @@ -30,11 +30,11 @@ #pragma once // appleseed.foundation headers. +#include "foundation/log/log.h" #include "foundation/platform/compiler.h" #include "foundation/utility/commandlineparser/messagelist.h" #include "foundation/utility/commandlineparser/optionhandler.h" #include "foundation/utility/commandlineparser/parseresults.h" -#include "foundation/utility/log.h" // Standard headers. #include diff --git a/src/appleseed/foundation/utility/commandlineparser/messagelist.h b/src/appleseed/foundation/utility/commandlineparser/messagelist.h index c706ebfe84..84f152bbdd 100644 --- a/src/appleseed/foundation/utility/commandlineparser/messagelist.h +++ b/src/appleseed/foundation/utility/commandlineparser/messagelist.h @@ -31,8 +31,8 @@ // appleseed.foundation headers. #include "foundation/core/concepts/noncopyable.h" +#include "foundation/log/log.h" #include "foundation/platform/compiler.h" -#include "foundation/utility/log.h" // appleseed.main headers. #include "main/dllsymbol.h" diff --git a/src/appleseed/foundation/utility/commandlineparser/valueoptionhandler.h b/src/appleseed/foundation/utility/commandlineparser/valueoptionhandler.h index f1166eb690..1fbee08b41 100644 --- a/src/appleseed/foundation/utility/commandlineparser/valueoptionhandler.h +++ b/src/appleseed/foundation/utility/commandlineparser/valueoptionhandler.h @@ -30,13 +30,13 @@ #pragma once // appleseed.foundation headers. +#include "foundation/log/log.h" #include "foundation/platform/compiler.h" #include "foundation/utility/commandlineparser/messagelist.h" #include "foundation/utility/commandlineparser/optionhandler.h" #include "foundation/utility/commandlineparser/parseresults.h" #include "foundation/utility/foreach.h" #include "foundation/utility/iostreamop.h" -#include "foundation/utility/log.h" #include "foundation/utility/makevector.h" #include "foundation/utility/string.h" #include "foundation/utility/test.h" diff --git a/src/appleseed/foundation/utility/job/jobmanager.cpp b/src/appleseed/foundation/utility/job/jobmanager.cpp index 74aa9f8780..ba66857b36 100644 --- a/src/appleseed/foundation/utility/job/jobmanager.cpp +++ b/src/appleseed/foundation/utility/job/jobmanager.cpp @@ -31,10 +31,10 @@ #include "jobmanager.h" // appleseed.foundation headers. +#include "foundation/log/log.h" #include "foundation/utility/foreach.h" #include "foundation/utility/job/jobqueue.h" #include "foundation/utility/job/workerthread.h" -#include "foundation/utility/log.h" // Standard headers. #include diff --git a/src/appleseed/foundation/utility/job/workerthread.cpp b/src/appleseed/foundation/utility/job/workerthread.cpp index 48c43477fa..9fb9da8392 100644 --- a/src/appleseed/foundation/utility/job/workerthread.cpp +++ b/src/appleseed/foundation/utility/job/workerthread.cpp @@ -39,7 +39,7 @@ #include "foundation/utility/job/ijob.h" #include "foundation/utility/job/jobmanager.h" #include "foundation/utility/job/jobqueue.h" -#include "foundation/utility/log.h" +#include "foundation/log/log.h" // Standard headers. #include diff --git a/src/appleseed/foundation/utility/test/loggertestlistener.cpp b/src/appleseed/foundation/utility/test/loggertestlistener.cpp index 1362f69509..d23babd49b 100644 --- a/src/appleseed/foundation/utility/test/loggertestlistener.cpp +++ b/src/appleseed/foundation/utility/test/loggertestlistener.cpp @@ -31,10 +31,10 @@ #include "loggertestlistener.h" // appleseed.foundation headers. +#include "foundation/log/log.h" #include "foundation/platform/compiler.h" #include "foundation/platform/types.h" #include "foundation/utility/foreach.h" -#include "foundation/utility/log.h" #include "foundation/utility/otherwise.h" #include "foundation/utility/string.h" #include "foundation/utility/test.h" diff --git a/src/appleseed/foundation/utility/xercesc.h b/src/appleseed/foundation/utility/xercesc.h index b3e6a5d8e3..9c14c2e886 100644 --- a/src/appleseed/foundation/utility/xercesc.h +++ b/src/appleseed/foundation/utility/xercesc.h @@ -31,9 +31,9 @@ // appleseed.foundation headers. #include "foundation/core/concepts/noncopyable.h" +#include "foundation/log/log.h" #include "foundation/platform/thread.h" #include "foundation/utility/foreach.h" -#include "foundation/utility/log.h" // Xerces-C++ headers. #include "xercesc/sax/ErrorHandler.hpp" diff --git a/src/appleseed/renderer/global/globallogger.h b/src/appleseed/renderer/global/globallogger.h index 74e03f2a1e..07b10d77a3 100644 --- a/src/appleseed/renderer/global/globallogger.h +++ b/src/appleseed/renderer/global/globallogger.h @@ -30,7 +30,7 @@ #pragma once // appleseed.foundation headers. -#include "foundation/utility/log.h" +#include "foundation/log/log.h" // appleseed.main headers. #include "main/dllsymbol.h" diff --git a/src/appleseed/renderer/kernel/intersection/assemblytree.cpp b/src/appleseed/renderer/kernel/intersection/assemblytree.cpp index 068bb8a001..3a9f93767e 100644 --- a/src/appleseed/renderer/kernel/intersection/assemblytree.cpp +++ b/src/appleseed/renderer/kernel/intersection/assemblytree.cpp @@ -46,6 +46,7 @@ #include "renderer/utility/bbox.h" // appleseed.foundation headers. +#include "foundation/hash/siphash.h" #include "foundation/math/beziercurve.h" #include "foundation/math/permutation.h" #include "foundation/math/ray.h" @@ -56,7 +57,6 @@ #include "foundation/platform/timers.h" #include "foundation/utility/foreach.h" #include "foundation/utility/lazy.h" -#include "foundation/utility/siphash.h" #include "foundation/utility/statistics.h" #include "foundation/utility/string.h" diff --git a/src/appleseed/renderer/kernel/lighting/lightsample.h b/src/appleseed/renderer/kernel/lighting/lightsample.h index 8e557b7fb3..c774a563ac 100644 --- a/src/appleseed/renderer/kernel/lighting/lightsample.h +++ b/src/appleseed/renderer/kernel/lighting/lightsample.h @@ -34,7 +34,7 @@ // appleseed.foundation headers. #include "foundation/containers/hashtable.h" -#include "foundation/math/hash.h" +#include "foundation/hash/hash.h" #include "foundation/utility/uid.h" // Standard headers. diff --git a/src/appleseed/renderer/kernel/lighting/lighttracing/lighttracingsamplegenerator.cpp b/src/appleseed/renderer/kernel/lighting/lighttracing/lighttracingsamplegenerator.cpp index 578aa2cebe..b6948d70d1 100644 --- a/src/appleseed/renderer/kernel/lighting/lighttracing/lighttracingsamplegenerator.cpp +++ b/src/appleseed/renderer/kernel/lighting/lighttracing/lighttracingsamplegenerator.cpp @@ -65,11 +65,11 @@ #include "renderer/utility/transformsequence.h" // appleseed.foundation headers. +#include "foundation/hash/hash.h" #include "foundation/image/canvasproperties.h" #include "foundation/image/color.h" #include "foundation/image/image.h" #include "foundation/math/basis.h" -#include "foundation/math/hash.h" #include "foundation/math/population.h" #include "foundation/math/sampling/mappings.h" #include "foundation/math/scalar.h" diff --git a/src/appleseed/renderer/kernel/lighting/sppm/sppmpasscallback.cpp b/src/appleseed/renderer/kernel/lighting/sppm/sppmpasscallback.cpp index 5c44500333..a5668b1206 100644 --- a/src/appleseed/renderer/kernel/lighting/sppm/sppmpasscallback.cpp +++ b/src/appleseed/renderer/kernel/lighting/sppm/sppmpasscallback.cpp @@ -40,9 +40,9 @@ #include "renderer/modeling/scene/scene.h" // appleseed.foundation headers. +#include "foundation/hash/hash.h" #include "foundation/image/canvasproperties.h" #include "foundation/image/image.h" -#include "foundation/math/hash.h" #include "foundation/memory/memory.h" #include "foundation/utility/job/iabortswitch.h" #include "foundation/utility/string.h" diff --git a/src/appleseed/renderer/kernel/lighting/sppm/sppmphotontracer.cpp b/src/appleseed/renderer/kernel/lighting/sppm/sppmphotontracer.cpp index 51dd0fe6af..84a01e06d5 100644 --- a/src/appleseed/renderer/kernel/lighting/sppm/sppmphotontracer.cpp +++ b/src/appleseed/renderer/kernel/lighting/sppm/sppmphotontracer.cpp @@ -63,8 +63,8 @@ #include "renderer/utility/transformsequence.h" // appleseed.foundation headers. +#include "foundation/hash/hash.h" #include "foundation/math/basis.h" -#include "foundation/math/hash.h" #include "foundation/math/knn/knn_anyquery.h" #include "foundation/math/sampling/mappings.h" #include "foundation/math/scalar.h" diff --git a/src/appleseed/renderer/kernel/rendering/final/texturecontrolledpixelrenderer.cpp b/src/appleseed/renderer/kernel/rendering/final/texturecontrolledpixelrenderer.cpp index 323b3e66a4..f30fcc9111 100644 --- a/src/appleseed/renderer/kernel/rendering/final/texturecontrolledpixelrenderer.cpp +++ b/src/appleseed/renderer/kernel/rendering/final/texturecontrolledpixelrenderer.cpp @@ -46,11 +46,11 @@ // appleseed.foundation headers. #include "foundation/containers/dictionary.h" +#include "foundation/hash/hash.h" #include "foundation/image/canvasproperties.h" #include "foundation/image/image.h" #include "foundation/math/aabb.h" #include "foundation/math/filtersamplingtable.h" -#include "foundation/math/hash.h" #include "foundation/math/population.h" #include "foundation/math/scalar.h" #include "foundation/math/vector.h" diff --git a/src/appleseed/renderer/kernel/rendering/final/uniformpixelrenderer.cpp b/src/appleseed/renderer/kernel/rendering/final/uniformpixelrenderer.cpp index 79331b13bd..398037650e 100644 --- a/src/appleseed/renderer/kernel/rendering/final/uniformpixelrenderer.cpp +++ b/src/appleseed/renderer/kernel/rendering/final/uniformpixelrenderer.cpp @@ -47,11 +47,11 @@ // appleseed.foundation headers. #include "foundation/containers/dictionary.h" +#include "foundation/hash/hash.h" #include "foundation/image/canvasproperties.h" #include "foundation/image/image.h" #include "foundation/math/aabb.h" #include "foundation/math/filtersamplingtable.h" -#include "foundation/math/hash.h" #include "foundation/math/population.h" #include "foundation/math/scalar.h" #include "foundation/math/vector.h" diff --git a/src/appleseed/renderer/kernel/rendering/generic/genericframerenderer.cpp b/src/appleseed/renderer/kernel/rendering/generic/genericframerenderer.cpp index f79b23b1d7..f6d4dcc546 100644 --- a/src/appleseed/renderer/kernel/rendering/generic/genericframerenderer.cpp +++ b/src/appleseed/renderer/kernel/rendering/generic/genericframerenderer.cpp @@ -47,9 +47,9 @@ // appleseed.foundation headers. #include "foundation/containers/dictionary.h" #include "foundation/core/concepts/noncopyable.h" +#include "foundation/hash/hash.h" #include "foundation/image/canvasproperties.h" #include "foundation/image/image.h" -#include "foundation/math/hash.h" #include "foundation/platform/thread.h" #include "foundation/utility/foreach.h" #include "foundation/utility/job.h" diff --git a/src/appleseed/renderer/kernel/rendering/generic/generictilerenderer.cpp b/src/appleseed/renderer/kernel/rendering/generic/generictilerenderer.cpp index c93607396c..0c8757daa9 100644 --- a/src/appleseed/renderer/kernel/rendering/generic/generictilerenderer.cpp +++ b/src/appleseed/renderer/kernel/rendering/generic/generictilerenderer.cpp @@ -44,11 +44,11 @@ #include "renderer/utility/bbox.h" // appleseed.foundation headers. +#include "foundation/hash/hash.h" #include "foundation/image/canvasproperties.h" #include "foundation/image/image.h" #include "foundation/image/tile.h" #include "foundation/math/aabb.h" -#include "foundation/math/hash.h" #include "foundation/math/ordering.h" #include "foundation/math/scalar.h" #include "foundation/math/vector.h" diff --git a/src/appleseed/renderer/kernel/texturing/texturestore.h b/src/appleseed/renderer/kernel/texturing/texturestore.h index 634c164a93..2e25afad28 100644 --- a/src/appleseed/renderer/kernel/texturing/texturestore.h +++ b/src/appleseed/renderer/kernel/texturing/texturestore.h @@ -35,7 +35,7 @@ // appleseed.foundation headers. #include "foundation/core/concepts/noncopyable.h" -#include "foundation/math/hash.h" +#include "foundation/hash/hash.h" #include "foundation/platform/atomic.h" #include "foundation/platform/thread.h" #include "foundation/utility/cache.h" diff --git a/src/appleseed/renderer/modeling/entity/entity.h b/src/appleseed/renderer/modeling/entity/entity.h index 10f9d77c0f..2005758102 100644 --- a/src/appleseed/renderer/modeling/entity/entity.h +++ b/src/appleseed/renderer/modeling/entity/entity.h @@ -34,8 +34,8 @@ // appleseed.foundation headers. #include "foundation/core/concepts/iunknown.h" +#include "foundation/hash/siphash.h" #include "foundation/utility/job/iabortswitch.h" -#include "foundation/utility/siphash.h" #include "foundation/utility/uid.h" #include "foundation/utility/version.h" diff --git a/src/appleseed/renderer/modeling/input/scalarsource.h b/src/appleseed/renderer/modeling/input/scalarsource.h index 44b3d4e133..2ef7d22365 100644 --- a/src/appleseed/renderer/modeling/input/scalarsource.h +++ b/src/appleseed/renderer/modeling/input/scalarsource.h @@ -34,9 +34,9 @@ #include "renderer/modeling/input/source.h" // appleseed.foundation headers. +#include "foundation/hash/siphash.h" #include "foundation/image/color.h" #include "foundation/platform/compiler.h" -#include "foundation/utility/siphash.h" // Standard headers. #include diff --git a/src/appleseed/renderer/modeling/input/texturesource.cpp b/src/appleseed/renderer/modeling/input/texturesource.cpp index dbf28d1b0b..05af156622 100644 --- a/src/appleseed/renderer/modeling/input/texturesource.cpp +++ b/src/appleseed/renderer/modeling/input/texturesource.cpp @@ -36,8 +36,8 @@ #include "renderer/modeling/texture/texture.h" // appleseed.foundation headers. +#include "foundation/hash/hash.h" #include "foundation/image/tile.h" -#include "foundation/math/hash.h" #include "foundation/math/scalar.h" // Standard headers. diff --git a/src/appleseed/renderer/modeling/object/meshobjectoperations.cpp b/src/appleseed/renderer/modeling/object/meshobjectoperations.cpp index a4b39a558a..2e8664fe9a 100644 --- a/src/appleseed/renderer/modeling/object/meshobjectoperations.cpp +++ b/src/appleseed/renderer/modeling/object/meshobjectoperations.cpp @@ -36,8 +36,8 @@ #include "renderer/utility/triangle.h" // appleseed.foundation headers. +#include "foundation/hash/murmurhash.h" #include "foundation/math/vector.h" -#include "foundation/utility/murmurhash.h" // Standard headers. #include diff --git a/src/appleseed/renderer/modeling/project/projectfilereader.cpp b/src/appleseed/renderer/modeling/project/projectfilereader.cpp index 59a67c7872..c0b032432c 100644 --- a/src/appleseed/renderer/modeling/project/projectfilereader.cpp +++ b/src/appleseed/renderer/modeling/project/projectfilereader.cpp @@ -103,6 +103,7 @@ // appleseed.foundation headers. #include "foundation/containers/dictionary.h" #include "foundation/core/exceptions/exceptionunsupportedfileformat.h" +#include "foundation/log/log.h" #include "foundation/math/aabb.h" #include "foundation/math/matrix.h" #include "foundation/math/scalar.h" @@ -116,7 +117,6 @@ #include "foundation/utility/api/apistring.h" #include "foundation/utility/foreach.h" #include "foundation/utility/iterators.h" -#include "foundation/utility/log.h" #include "foundation/utility/otherwise.h" #include "foundation/utility/searchpaths.h" #include "foundation/utility/stopwatch.h" diff --git a/src/appleseed/renderer/modeling/project/projecttracker.cpp b/src/appleseed/renderer/modeling/project/projecttracker.cpp index c4ea3fbf73..6021a5570b 100644 --- a/src/appleseed/renderer/modeling/project/projecttracker.cpp +++ b/src/appleseed/renderer/modeling/project/projecttracker.cpp @@ -49,9 +49,9 @@ #include "renderer/modeling/texture/texture.h" // appleseed.foundation headers. +#include "foundation/log/log.h" #include "foundation/platform/types.h" #include "foundation/utility/api/apistring.h" -#include "foundation/utility/log.h" #include "foundation/utility/uid.h" // Standard headers. @@ -354,7 +354,7 @@ struct ProjectTracker::Impl LOG_INFO(logger, FMT_ENTITY " is referenced by:", kv.first->get_path().c_str(), kv.first->get_uid()); - + for (const auto& incoming_ref : kv.second) { if (incoming_ref.m_input_name == nullptr) @@ -401,7 +401,7 @@ struct ProjectTracker::Impl LOG_INFO(logger, FMT_ENTITY " has references to:", kv.first->get_path().c_str(), kv.first->get_uid()); - + for (const auto& outgoing_ref : kv.second) { LOG_INFO(logger, " " FMT_ENTITY, diff --git a/src/appleseed/renderer/modeling/surfaceshader/diagnosticsurfaceshader.cpp b/src/appleseed/renderer/modeling/surfaceshader/diagnosticsurfaceshader.cpp index 521d6ba289..7dbf561890 100644 --- a/src/appleseed/renderer/modeling/surfaceshader/diagnosticsurfaceshader.cpp +++ b/src/appleseed/renderer/modeling/surfaceshader/diagnosticsurfaceshader.cpp @@ -51,11 +51,11 @@ // appleseed.foundation headers. #include "foundation/containers/dictionary.h" +#include "foundation/hash/hash.h" #include "foundation/image/color.h" #include "foundation/image/colorspace.h" #include "foundation/math/aabb.h" #include "foundation/math/distance.h" -#include "foundation/math/hash.h" #include "foundation/math/minmax.h" #include "foundation/math/sampling/mappings.h" #include "foundation/math/scalar.h" diff --git a/src/tools/animatecamera/animationpath.cpp b/src/tools/animatecamera/animationpath.cpp index 14567161b7..5e0c5cb871 100644 --- a/src/tools/animatecamera/animationpath.cpp +++ b/src/tools/animatecamera/animationpath.cpp @@ -36,7 +36,7 @@ #include "foundation/math/scalar.h" #include "foundation/math/vector.h" #include "foundation/platform/types.h" -#include "foundation/utility/log.h" +#include "foundation/log/log.h" // Standard headers. #include diff --git a/src/tools/animatecamera/commandlinehandler.cpp b/src/tools/animatecamera/commandlinehandler.cpp index 07dfeb231e..fdc1025e0b 100644 --- a/src/tools/animatecamera/commandlinehandler.cpp +++ b/src/tools/animatecamera/commandlinehandler.cpp @@ -34,7 +34,7 @@ #include "application/superlogger.h" // appleseed.foundation headers. -#include "foundation/utility/log.h" +#include "foundation/log/log.h" #include "foundation/utility/makevector.h" using namespace appleseed::common; diff --git a/src/tools/animatecamera/main.cpp b/src/tools/animatecamera/main.cpp index d520459b85..48036eeae4 100644 --- a/src/tools/animatecamera/main.cpp +++ b/src/tools/animatecamera/main.cpp @@ -50,7 +50,7 @@ #include "foundation/platform/types.h" #include "foundation/memory/autoreleaseptr.h" #include "foundation/containers/dictionary.h" -#include "foundation/utility/log.h" +#include "foundation/log/log.h" #include "foundation/utility/string.h" // Boost headers. diff --git a/src/tools/convertmeshfile/commandlinehandler.cpp b/src/tools/convertmeshfile/commandlinehandler.cpp index 3b63a223fd..a62356c826 100644 --- a/src/tools/convertmeshfile/commandlinehandler.cpp +++ b/src/tools/convertmeshfile/commandlinehandler.cpp @@ -34,7 +34,7 @@ #include "application/superlogger.h" // appleseed.foundation headers. -#include "foundation/utility/log.h" +#include "foundation/log/log.h" using namespace appleseed::common; using namespace foundation; diff --git a/src/tools/convertmeshfile/main.cpp b/src/tools/convertmeshfile/main.cpp index 78d312a22c..98dd513c13 100644 --- a/src/tools/convertmeshfile/main.cpp +++ b/src/tools/convertmeshfile/main.cpp @@ -44,7 +44,7 @@ #include "foundation/platform/compiler.h" #include "foundation/containers/dictionary.h" #include "foundation/utility/foreach.h" -#include "foundation/utility/log.h" +#include "foundation/log/log.h" // Standard headers. #include diff --git a/src/tools/dumpmetadata/commandlinehandler.cpp b/src/tools/dumpmetadata/commandlinehandler.cpp index f49ab16ee1..8edb6b84ab 100644 --- a/src/tools/dumpmetadata/commandlinehandler.cpp +++ b/src/tools/dumpmetadata/commandlinehandler.cpp @@ -33,7 +33,7 @@ #include "application/superlogger.h" // appleseed.foundation headers. -#include "foundation/utility/log.h" +#include "foundation/log/log.h" using namespace appleseed::common; using namespace foundation; diff --git a/src/tools/dumpmetadata/main.cpp b/src/tools/dumpmetadata/main.cpp index 097cd0a2e3..cf6b4f2827 100644 --- a/src/tools/dumpmetadata/main.cpp +++ b/src/tools/dumpmetadata/main.cpp @@ -60,7 +60,7 @@ #include "foundation/utility/api/specializedapiarrays.h" #include "foundation/containers/dictionary.h" #include "foundation/utility/indenter.h" -#include "foundation/utility/log.h" +#include "foundation/log/log.h" #include "foundation/utility/string.h" #include "foundation/utility/xmlelement.h" diff --git a/src/tools/makefluffy/commandlinehandler.cpp b/src/tools/makefluffy/commandlinehandler.cpp index 9d28c09fb6..9874e6cb42 100644 --- a/src/tools/makefluffy/commandlinehandler.cpp +++ b/src/tools/makefluffy/commandlinehandler.cpp @@ -33,7 +33,7 @@ #include "application/superlogger.h" // appleseed.foundation headers. -#include "foundation/utility/log.h" +#include "foundation/log/log.h" using namespace appleseed::common; using namespace foundation; diff --git a/src/tools/projecttool/commandlinehandler.cpp b/src/tools/projecttool/commandlinehandler.cpp index d2c364e390..0363f5a6f3 100644 --- a/src/tools/projecttool/commandlinehandler.cpp +++ b/src/tools/projecttool/commandlinehandler.cpp @@ -34,7 +34,7 @@ #include "application/superlogger.h" // appleseed.foundation headers. -#include "foundation/utility/log.h" +#include "foundation/log/log.h" using namespace appleseed::common; using namespace foundation;