diff --git a/src/proc/asset/meta/error-log.cpp b/src/proc/asset/meta/error-log.cpp index 81d9db22f..9f6cd9ef3 100644 --- a/src/proc/asset/meta/error-log.cpp +++ b/src/proc/asset/meta/error-log.cpp @@ -31,13 +31,13 @@ #include "proc/assetmanager.hpp" //#include "lib/time/timevalue.hpp" //#include "lib/format-string.hpp" -#include "lib/util.hpp" +//#include "lib/util.hpp" //#include //using util::_Fmt; //using util::cStr; -using util::isnil; +//using util::isnil; //using std::string; using std::dynamic_pointer_cast; @@ -90,7 +90,7 @@ namespace meta { lib::P Builder::commit() { - ASSERT (isnil (nameID), "only the single global Error Log is implemented for now"); ////////////////////TICKET #1157 : and the entity created here is bare of any functionality + ASSERT (nameID == theErrorLog_ID.getSym(), "only the single global Error Log is implemented for now");///TICKET #1157 : and the entity created here is bare of any functionality return AssetManager::wrap (*new ErrorLog{theErrorLog_ID}); } diff --git a/tests/core/proc/asset/asset-diagnostics.hpp b/tests/core/proc/asset/asset-diagnostics.hpp index 4f93636cb..2e91b5e71 100644 --- a/tests/core/proc/asset/asset-diagnostics.hpp +++ b/tests/core/proc/asset/asset-diagnostics.hpp @@ -54,14 +54,14 @@ namespace proc { namespace asset { inline void - dump (PcAsset& aa) + dump (PcAsset const& aa) { if (!aa) cout << "Asset(NULL)\n"; else { _Fmt fmt("%s %|50T.| id=%s adr=%p smart-ptr=%p use-count=%u"); - cout << fmt % aa % aa->getID() % aa.get() % &aa % (aa.use_count() - 1) << "\n"; + cout << fmt % aa % aa->getID() % (void*)aa.get() % &aa % (aa.use_count() - 1) << "\n"; } } @@ -70,7 +70,8 @@ namespace asset { { list assets (AssetManager::instance().listContent()); cout << "----all-registered-Assets----\n"; - for_each (assets, bind (&dump, _1)); + for (auto const& pA : assets) + dump (pA); } diff --git a/tests/core/proc/asset/create-asset-test.cpp b/tests/core/proc/asset/create-asset-test.cpp index 8152d4bb6..ece46790f 100644 --- a/tests/core/proc/asset/create-asset-test.cpp +++ b/tests/core/proc/asset/create-asset-test.cpp @@ -236,9 +236,13 @@ namespace test { // for the ErrorLog assert, as of 8/2018 there is just one single global placeholder entity available asset::meta::PLog globalLog = asset::meta::ErrorLog::global(); /////////////////////////////////TICKET #1157 : what's the purpose of this ErrorLog Asset after all?? - CHECK (globalLog->ident.name == meta::theErrorLog_ID.getSym()); CHECK (AssetManager::instance().known (globalLog->getID())); + CHECK (2 == globalLog.use_count()); // AssetManager also holds a reference + + PAsset furtherRef = asset::meta::ErrorLog::global(); + CHECK (3 == globalLog.use_count()); + CHECK (furtherRef == globalLog); } }; diff --git a/tests/core/proc/asset/typed-id-test.cpp b/tests/core/proc/asset/typed-id-test.cpp index 7fdc569f3..737b71901 100644 --- a/tests/core/proc/asset/typed-id-test.cpp +++ b/tests/core/proc/asset/typed-id-test.cpp @@ -111,7 +111,7 @@ namespace test{ * - re-access the instances just by symbolic ID * - verify the registration is cleaned up automatically. * - * @todo partially unimplemented and thus commented out ////////////////////TICKET #599 + * @todo draft from 2010 -- partially unimplemented and thus commented out //////////////////////////////////////////STICKET #599 * * @see typed-id.hpp interface covered here * @see typed-lookup.cpp implementation diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index cbb1e9430..f4079ede1 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -14325,7 +14325,7 @@ - + @@ -32053,6 +32053,10 @@ + + + + @@ -32134,6 +32138,12 @@ + + + + + + @@ -32215,7 +32225,7 @@ - +