[Bf-blender-cvs] [f12ea3d52e6] master: Cleanup: reserve C++ comments for disabled code

Campbell Barton noreply at git.blender.org
Thu Oct 14 07:44:28 CEST 2021


Commit: f12ea3d52e64dfba3170ac1465a9a451d0cb20bd
Author: Campbell Barton
Date:   Thu Oct 14 16:41:35 2021 +1100
Branches: master
https://developer.blender.org/rBf12ea3d52e64dfba3170ac1465a9a451d0cb20bd

Cleanup: reserve C++ comments for disabled code

===================================================================

M	source/blender/blenkernel/intern/asset_catalog.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/asset_catalog.cc b/source/blender/blenkernel/intern/asset_catalog.cc
index f66fda1a0bc..f3a4f88ef38 100644
--- a/source/blender/blenkernel/intern/asset_catalog.cc
+++ b/source/blender/blenkernel/intern/asset_catalog.cc
@@ -243,7 +243,7 @@ void AssetCatalogService::load_from_disk(const CatalogFilePath &file_or_director
 {
   BLI_stat_t status;
   if (BLI_stat(file_or_directory_path.data(), &status) == -1) {
-    // TODO(@sybren): throw an appropriate exception.
+    /* TODO(@sybren): throw an appropriate exception. */
     return;
   }
 
@@ -254,7 +254,7 @@ void AssetCatalogService::load_from_disk(const CatalogFilePath &file_or_director
     load_directory_recursive(file_or_directory_path);
   }
   else {
-    // TODO(@sybren): throw an appropriate exception.
+    /* TODO(@sybren): throw an appropriate exception. */
   }
 
   /* TODO: Should there be a sanitize step? E.g. to remove catalogs with identical paths? */
@@ -264,8 +264,8 @@ void AssetCatalogService::load_from_disk(const CatalogFilePath &file_or_director
 
 void AssetCatalogService::load_directory_recursive(const CatalogFilePath &directory_path)
 {
-  // TODO(@sybren): implement proper multi-file support. For now, just load
-  // the default file if it is there.
+  /* TODO(@sybren): implement proper multi-file support. For now, just load
+   * the default file if it is there. */
   CatalogFilePath file_path = asset_definition_default_file_path_from_dir(directory_path);
 
   if (!BLI_exists(file_path.data())) {
@@ -297,7 +297,7 @@ std::unique_ptr<AssetCatalogDefinitionFile> AssetCatalogService::parse_catalog_f
   auto catalog_parsed_callback = [this, catalog_definition_file_path](
                                      std::unique_ptr<AssetCatalog> catalog) {
     if (catalog_collection_->catalogs_.contains(catalog->catalog_id)) {
-      // TODO(@sybren): apparently another CDF was already loaded. This is not supported yet.
+      /* TODO(@sybren): apparently another CDF was already loaded. This is not supported yet. */
       std::cerr << catalog_definition_file_path << ": multiple definitions of catalog "
                 << catalog->catalog_id << " in multiple files, ignoring this one." << std::endl;
       /* Don't store 'catalog'; unique_ptr will free its memory. */
@@ -805,16 +805,16 @@ bool AssetCatalogDefinitionFile::write_to_disk_unsafe(const CatalogFilePath &des
 
   std::ofstream output(dest_file_path);
 
-  // TODO(@sybren): remember the line ending style that was originally read, then use that to write
-  // the file again.
+  /* TODO(@sybren): remember the line ending style that was originally read, then use that to write
+   * the file again. */
 
-  // Write the header.
+  /* Write the header. */
   output << HEADER;
   output << "" << std::endl;
   output << VERSION_MARKER << SUPPORTED_VERSION << std::endl;
   output << "" << std::endl;
 
-  // Write the catalogs, ordered by path (primary) and UUID (secondary).
+  /* Write the catalogs, ordered by path (primary) and UUID (secondary). */
   AssetCatalogOrderedSet catalogs_by_path;
   for (const AssetCatalog *catalog : catalogs_.values()) {
     if (catalog->flags.is_deleted) {



More information about the Bf-blender-cvs mailing list