cleanup: rectify Proc-Layer namespaces (I)

src/common/configrules.hpp

@@ -68,7 +68,7 @@
 namespace lumiera {  ///////TODO: shouldn't that be namespace lib? or proc?
   
   using std::string;
-  using lumiera::P;
+  using lib::P;
   
   
   
@@ -212,13 +212,13 @@ namespace lumiera {  ///////TODO: shouldn't that be namespace lib? or proc?
    *  the list of all concrete types participating in the
    *  rule based config query system
    */
-  typedef lumiera::typelist::Types < mobject::session::Track
-                                   , asset::Pipe
-                                   , const asset::ProcPatt
-                                   , asset::Timeline
-                                   , asset::Sequence
-                                   > ::List
-                                     InterfaceTypes;
+  typedef typelist::Types < proc::mobject::session::Track
+                          , proc::asset::Pipe
+                          , const proc::asset::ProcPatt
+                          , proc::asset::Timeline
+                          , proc::asset::Sequence
+                          > ::List
+                            InterfaceTypes;
   
   /** 
    * user-visible Interface to the ConfigRules subsystem.

src/common/query/fake-configrules.hpp

@@ -54,10 +54,12 @@
 namespace lumiera {
   namespace query {
     
+    namespace asset = proc::asset;
+    
     using asset::Pipe;
     using asset::ProcPatt;
     using asset::PProcPatt;
-    using mobject::Session;
+    using proc::mobject::Session;
     
     using util::isnil;
     

src/lib/element-tracker.hpp

@@ -66,7 +66,6 @@
 
 namespace lib {
   
-  using lumiera::P;
   using util::isSameObject;
   
   /**
@@ -189,7 +188,7 @@ namespace lib {
         }
       
       
-      typedef lumiera::P<TAR> PTarget;
+      typedef P<TAR> PTarget;
       
       /** factory for creating smart-ptr managed
        *  TAR instances, automatically registered

src/lib/meta/trait.hpp

@@ -45,7 +45,7 @@ namespace tr1 {
   template<class X> class reference_wrapper; 
   template<class X> class shared_ptr; 
 }}
-namespace lumiera{
+namespace lib{
   template<class X, class B>  class P; 
 }
 namespace mobject{
@@ -127,12 +127,12 @@ namespace meta {
     };
   
   template<typename X, class B>
-  struct Unwrap<lumiera::P<X, B> >
+  struct Unwrap<P<X, B> >
     {
       typedef X  Type;
       
       static X&
-      extract (lumiera::P<X,B> ptr)
+      extract (P<X,B> ptr)
         {
           ASSERT (ptr);
           return *ptr;

src/lib/p.hpp

@@ -46,15 +46,15 @@
  */
 
 
-#ifndef LUMIERA_P_H
-#define LUMIERA_P_H
+#ifndef LIB_P_H
+#define LIB_P_H
 
 
 #include "lib/error.hpp"
 #include <tr1/memory>
 
 
-namespace lumiera {
+namespace lib {
   
   using std::tr1::shared_ptr;
   using std::tr1::weak_ptr;
@@ -125,5 +125,5 @@ namespace lumiera {
     };
   
   
-} // namespace lumiera
+} // namespace lib
 #endif

src/lib/wrapperptr.hpp

@@ -34,16 +34,20 @@
 #include "lib/p.hpp"
 
 
-namespace asset   { class Asset; }
-namespace mobject { class MObject; }
+namespace proc {
+  namespace asset   { class Asset; }
+  namespace mobject { class MObject; }
+  
+  
+  typedef ::lumiera::typelist::Types < mobject::Placement<mobject::MObject>*
+                                     , lib::P<asset::Asset>*
+                                     > ::List
+                                     WrapperTypes;
+}
 
 namespace lumiera {
   
   
-  typedef typelist::Types < mobject::Placement<mobject::MObject>*
-                          , P<asset::Asset>*
-                          > ::List
-                          WrapperTypes;
   
   /** 
    * helper to treat various sorts of smart-ptrs uniformly.
@@ -55,7 +59,7 @@ namespace lumiera {
    * error reporting is similar to the behaviour of dynamic_cast<T>: when retrieving
    * a pointer, NULL is returned in case of mismatch.
    */
-  typedef lib::Variant<WrapperTypes, util::AccessCasted> WrapperPtr;
+  typedef lib::Variant<proc::WrapperTypes, util::AccessCasted> WrapperPtr;
   
   
   

src/proc/asset.cpp

@@ -43,6 +43,7 @@ using util::isnil;
 using util::cStr;
 
 
+namespace proc {
 namespace asset {
   
   using ::NOBUG_FLAG(memory);
@@ -198,4 +199,4 @@ namespace asset {
   }
 
   
-} // namespace asset
+}} // namespace proc::asset

src/proc/asset.hpp

@@ -75,16 +75,17 @@ using std::vector;
 using std::set;
 
 
-
+namespace proc {
 namespace asset {
   
+  namespace error = lumiera::error;
+  
   using std::size_t;
   using std::tr1::shared_ptr;
   using std::tr1::static_pointer_cast;
 
-  using lumiera::P;
+  using lib::P;
   
-  //NOBUG_DECLARE_FLAG (assetmem);
   
   typedef size_t HashVal;                        /////////////////TICKET #722
   
@@ -358,17 +359,17 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 
 
 
 namespace proc_interface {
   
-  using asset::Asset;
-  using asset::Category;
-  using asset::ID;
-  using asset::IDA;
-  using asset::PAsset;
+  using proc::asset::Asset;
+  using proc::asset::Category;
+  using proc::asset::ID;
+  using proc::asset::IDA;
+  using proc::asset::PAsset;
 }
 
 #endif

src/proc/asset/asset-format.hpp

@@ -31,6 +31,7 @@
 
 
 
+namespace proc {
 namespace asset {
   
   
@@ -49,5 +50,5 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/buildinstruct.hpp

@@ -28,8 +28,8 @@
  */
 
 
-#ifndef ASSET_BUILDINSTRUCT_H
-#define ASSET_BUILDINSTRUCT_H
+#ifndef PROC_ASSET_BUILDINSTRUCT_H
+#define PROC_ASSET_BUILDINSTRUCT_H
 
 
 #include "lib/symbol.hpp"
@@ -41,9 +41,10 @@ using std::string;
 
 
 
+namespace proc {
 namespace asset {
 
-  using lumiera::P;
+  using lib::P;
   using lib::Symbol;
   using lib::Literal;
   
@@ -127,5 +128,5 @@ namespace asset {
     
     
     
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/category.cpp

@@ -30,8 +30,8 @@
 using boost::algorithm::starts_with;
 using util::isnil;
 
-namespace asset
-  {
+namespace proc {
+namespace asset {
   
   /** human readable representation of the asset::Category.
    *  @todo to be localized.
@@ -69,4 +69,4 @@ namespace asset
   }
 
 
-} // namespace asset
+}} // namespace asset

src/proc/asset/category.hpp

@@ -21,8 +21,8 @@
 */
 
 
-#ifndef ASSET_CATEGORY_H
-#define ASSET_CATEGORY_H
+#ifndef PROC_ASSET_CATEGORY_H
+#define PROC_ASSET_CATEGORY_H
 
 #include "lib/symbol.hpp"
 
@@ -31,6 +31,7 @@
 
 
 
+namespace proc {
 namespace asset {
   
   using lib::Literal;
@@ -111,5 +112,5 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/clip.cpp

@@ -27,6 +27,7 @@
 using std::tr1::static_pointer_cast;
 
 
+namespace proc {
 namespace asset {
   
   namespace {
@@ -105,4 +106,4 @@ namespace asset {
 
 
 
-} // namespace asset
+}} // namespace proc::asset

src/proc/asset/clip.hpp

@@ -30,8 +30,9 @@
 
 /////////////////////////TODO: 1/2010 very likely the handling of the clip-asset needs to be rewritten
 
-namespace asset
-  {
+namespace proc {
+namespace asset {
+  
   /**
    * bookkeeping (Asset) view of a media clip.
    */
@@ -52,14 +53,14 @@ namespace asset
       
       virtual PClip getClipAsset ();
       virtual PMedia checkCompound ();
-
+      
     };
-    
-    typedef P<const asset::Clip> PClipAsset;
-    
-    const string CLIP_SUBFOLDER = "clips";      // TODO: handling of hard-wired constants....
-    
-    
-    
-} // namespace asset
+  
+  typedef P<const asset::Clip> PClipAsset;
+  
+  const string CLIP_SUBFOLDER = "clips";      // TODO: handling of hard-wired constants....
+  
+  
+  
+}} // namespace proc:asset
 #endif

src/proc/asset/codec.cpp

@@ -23,8 +23,9 @@
 
 #include "proc/asset/codec.hpp"
 
+namespace proc {
 namespace asset {
 
 
 
-} // namespace asset
+}} // namespace proc::asset

src/proc/asset/codec.hpp

@@ -28,6 +28,7 @@
 
 
 
+namespace proc {
 namespace asset {
   
   /**
@@ -40,5 +41,5 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/compoundmedia.cpp

@@ -23,6 +23,7 @@
 
 #include "proc/asset/compoundmedia.hpp"
 
+namespace proc {
 namespace asset
   {
   
@@ -30,4 +31,4 @@ namespace asset
 
 
 
-} // namespace asset
+  }} // namespace proc::asset

src/proc/asset/compoundmedia.hpp

@@ -32,6 +32,7 @@ using std::vector;
 
 
 
+namespace proc {
 namespace asset {
 
 
@@ -49,5 +50,5 @@ namespace asset {
     
     
     
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/dataset.hpp

@@ -28,15 +28,15 @@
 
 
 
-namespace asset
-  {
-
-
+namespace proc {
+namespace asset {
+  
+  
   /**
    * meta asset describing a collection of control data
    */
   class Dataset : public Meta
     {};
-
-} // namespace asset
+  
+}} // namespace proc::asset
 #endif

src/proc/asset/db.hpp

@@ -35,6 +35,7 @@
 #include <boost/utility.hpp>
 
 
+namespace proc {
 namespace asset {
   
   using std::tr1::static_pointer_cast;
@@ -167,5 +168,5 @@ namespace asset {
     };
   
     
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/effect.cpp

@@ -23,6 +23,7 @@
 
 #include "proc/asset/effect.hpp"
 
+namespace proc {
 namespace asset {
   
   Proc::ProcFunc*
@@ -33,4 +34,4 @@ namespace asset {
 
 
 
-} // namespace asset
+}} // namespace asset

src/proc/asset/effect.hpp

@@ -28,6 +28,7 @@
 
 
 
+namespace proc {
 namespace asset {
   
   /**
@@ -50,5 +51,5 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/entry-id.hpp

@@ -54,12 +54,12 @@
 #include <string>
 
 
+namespace proc {
 namespace asset {
   
   using std::string;
   using std::ostream;
   
-  using lumiera::error::LUMIERA_ERROR_WRONG_TYPE;
   
   
   namespace idi {
@@ -233,9 +233,9 @@ namespace asset {
       recast (BareEntryID const& bID)
         {
           if (!canRecast(bID))
-            throw lumiera::error::Logic ("unable to recast EntryID: desired type "
-                                         "doesn't match original definition"
-                                        , LUMIERA_ERROR_WRONG_TYPE);
+            throw error::Logic ("unable to recast EntryID: desired type "
+                                "doesn't match original definition"
+                               , error::LUMIERA_ERROR_WRONG_TYPE);
           return EntryID (bID.getSym());
         }
       
@@ -278,5 +278,5 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/inventory.hpp

@@ -28,6 +28,7 @@
 
 
 
+namespace proc {
 namespace asset {
 
 
@@ -43,5 +44,5 @@ namespace asset {
   typedef lumiera::P<Inventory> PInv;
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/media.cpp

@@ -52,6 +52,7 @@ using std::tr1::dynamic_pointer_cast;
 
 namespace error = lumiera::error;
 
+namespace proc {
 namespace asset {
   
   namespace { // Implementation details
@@ -229,18 +230,18 @@ namespace asset {
    *  @throw Invalid if the given media asset is not top-level,
    *         but rather part or a multichannel (compound) media
    */
-  P<asset::Clip>
-  MediaFactory::operator() (asset::Media& mediaref)  throw(lumiera::error::Invalid)
+  P<Clip>
+  MediaFactory::operator() (Media& mediaref)
   {
     if (mediaref.checkCompound())
-      throw lumiera::error::Invalid (str(format("Attempt to create a asset::Clip from the media %s, "
-                                                "which is not toplevel but rather part or a compound "
-                                                "(multichannel) media. Found parent Media %s.") 
-                                                % string(mediaref) 
-                                                % string(*mediaref.checkCompound()))
-                                    ,LUMIERA_ERROR_PART_OF_COMPOUND
-                                    );
-    asset::Clip* pC = new asset::Clip (mediaref);
+      throw error::Invalid (str(format("Attempt to create a asset::Clip from the media %s, "
+                                       "which is not toplevel but rather part or a compound "
+                                       "(multichannel) media. Found parent Media %s.") 
+                                       % string(mediaref) 
+                                       % string(*mediaref.checkCompound()))
+                           ,LUMIERA_ERROR_PART_OF_COMPOUND
+                           );
+    Clip* pC = new Clip (mediaref);
     return AssetManager::instance().wrap (*pC);
   }
   
@@ -249,4 +250,4 @@ namespace asset {
 
 
 
-} // namespace asset
+}} // namespace asset

src/proc/asset/media.hpp

@@ -43,6 +43,7 @@
 
 
 
+namespace proc {
 namespace asset {
   
   class Clip;
@@ -50,7 +51,6 @@ namespace asset {
   class MediaFactory;
   class ProcPatt;
   
-  using lumiera::P;
   using lib::time::Duration;
   
   
@@ -74,9 +74,9 @@ namespace asset {
       
     public:
       typedef P<Media> PMedia;
-      typedef P<asset::Clip> PClip;
-      typedef P<asset::ProcPatt> PProcPatt;
-      typedef mobject::session::PClipMO PClipMO;
+      typedef P<proc::asset::Clip> PClip;
+      typedef P<proc::asset::ProcPatt> PProcPatt;
+      typedef proc::mobject::session::PClipMO PClipMO;
      
       
       static MediaFactory create;
@@ -121,7 +121,7 @@ namespace asset {
        *  @return pointer to parent, or \code null
        */
       virtual PMedia checkCompound ()  const;
-      friend class asset::Clip;    ////////////////////////TODO better interface!!!
+      friend class proc::asset::Clip;    ////////////////////////TODO better interface!!!
 
     };
     
@@ -141,7 +141,7 @@ namespace asset {
   class MediaFactory : public lib::Factory<asset::Media>
     {
     public:
-      typedef P<asset::Media> PType;
+      typedef P<Media> PType;
       
       PType operator() (Asset::Ident& key, const string& file="");
       PType operator() (const string& file, const Category& cat);
@@ -151,8 +151,8 @@ namespace asset {
       PType operator() (const char* file, const Category& cat);
       PType operator() (const char* file, asset::Kind);
       
-      P<asset::Clip>
-      operator() (asset::Media& mediaref)  throw(lumiera::error::Invalid);
+      P<Clip>
+      operator() (Media& mediaref);
 
     };
 
@@ -161,5 +161,5 @@ namespace asset {
     
     
     
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/meta.cpp

@@ -26,6 +26,7 @@
 #include "lib/util.hpp"
 
 
+namespace proc {
 namespace asset {
   
   using meta::Descriptor;
@@ -104,4 +105,4 @@ namespace asset {
   
   template Builder<TimeGrid>  MetaFactory::operator() (Descriptor const&, EntryID<TimeGrid>);
   
-} // namespace asset
+}} // namespace proc::asset

src/proc/asset/meta.hpp

@@ -64,6 +64,7 @@
 
 
 
+namespace proc {
 namespace asset {
   
   class Meta;
@@ -160,5 +161,5 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/meta/time-grid.cpp

@@ -41,6 +41,7 @@ using boost::str;
 using std::string;
 
 
+namespace proc {
 namespace asset {
 namespace meta {
   
@@ -170,4 +171,4 @@ namespace meta {
   }
   
   
-}} // namespace asset::meta
+}}} // namespace asset::meta

src/proc/asset/meta/time-grid.hpp

@@ -54,6 +54,7 @@
 
 
 
+namespace proc {
 namespace asset {
 namespace meta {
   
@@ -66,7 +67,7 @@ namespace meta {
   
   
   class TimeGrid;
-  typedef lumiera::P<TimeGrid> PGrid;
+  typedef P<TimeGrid> PGrid;
   
   
   /**
@@ -131,5 +132,5 @@ namespace meta {
       
     };
   
-}} // namespace asset::meta
+}}} // namespace proc::asset::meta
 #endif

src/proc/asset/pipe.cpp

@@ -27,6 +27,7 @@
 
 using util::isnil;
 
+namespace proc {
 namespace asset {
   
   
@@ -83,4 +84,4 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace asset

src/proc/asset/pipe.hpp

@@ -26,16 +26,15 @@
 
 #include "proc/asset/struct.hpp"
 #include "proc/asset/procpatt.hpp"
-#include "lib/streamtype.hpp"
+#include "proc/streamtype.hpp"
 
 #include <string>
 
 
 
+namespace proc {
 namespace asset {
   
-  using lumiera::P;
-  using lumiera::StreamType;
   using std::string;
   
   class Pipe;
@@ -125,5 +124,5 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/preview.cpp

@@ -23,6 +23,7 @@
 
 #include "proc/asset/preview.hpp"
 
+namespace proc {
 namespace asset {
   
   
@@ -64,4 +65,4 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace asset

src/proc/asset/preview.hpp

@@ -28,6 +28,7 @@
 
 
 
+namespace proc {
 namespace asset {
   
   /**
@@ -43,5 +44,5 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/proc.cpp

@@ -27,6 +27,7 @@
 #include "include/logging.h"
 
 
+namespace proc {
 namespace asset {
   
   
@@ -47,4 +48,4 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace asset

src/proc/asset/proc.hpp

@@ -37,10 +37,11 @@
 
 #include "proc/asset.hpp"
 #include "lib/factory.hpp"
-#include "lib/streamtype.hpp"
+#include "proc/streamtype.hpp"
 
 
 
+namespace proc {
 namespace asset {
   
   
@@ -75,7 +76,7 @@ namespace asset {
           return static_cast<const ID<Proc>& > (Asset::getID()); 
         }
       
-      typedef lumiera::StreamType::ImplFacade::DataBuffer Buff;
+      typedef StreamType::ImplFacade::DataBuffer Buff;
       typedef Buff* PBuff;
       typedef void (ProcFunc) (PBuff);
       
@@ -124,5 +125,5 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/procpatt.cpp

@@ -29,8 +29,8 @@
 
 using util::isnil;
 
-namespace asset
-  {
+namespace proc {
+namespace asset {
   
   
   /** new processing pattern with empty instruction list.
@@ -117,4 +117,4 @@ namespace asset
   
 
 
-} // namespace asset
+}} // namespace asset

src/proc/asset/procpatt.hpp

@@ -33,9 +33,9 @@ using std::vector;
 
 
 
+namespace proc {
 namespace asset {
   
-  using lumiera::P;
   using lib::Symbol;
   
   class Proc;
@@ -73,5 +73,5 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/sequence.cpp

@@ -27,6 +27,7 @@
 //#include "proc/mobject/placement.hpp"
 //#include "proc/mobject/session/mobjectfactory.hpp"
 
+namespace proc {
 namespace asset {
   
   using lib::AutoRegistered;
@@ -62,4 +63,4 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace asset

src/proc/asset/sequence.hpp

@@ -62,6 +62,7 @@
 //using std::vector;
 //using std::string;
 
+namespace proc {
 namespace mobject {
 namespace session {
   
@@ -74,7 +75,7 @@ namespace asset {
   
   
   class Sequence;
-  typedef lumiera::P<Sequence> PSequence;
+  typedef P<Sequence> PSequence;
    
   
   
@@ -104,5 +105,5 @@ namespace asset {
 ///////////////////////////TODO currently just fleshing the API
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/struct-factory-impl.hpp

@@ -58,26 +58,29 @@
 #include <boost/format.hpp>
 #include <cstdlib>
 
-using boost::format;
 
-using mobject::Session;
-using mobject::MObject;
-using mobject::session::Scope;
-using mobject::session::match_specificTrack;
-using mobject::session::RBinding;
-using mobject::session::RTrack;
-
-using lib::Symbol;
-using util::isnil;
-using util::contains;
-using asset::Query;
-using lumiera::query::LUMIERA_ERROR_CAPABILITY_QUERY;
-using lumiera::query::extractID;
 
+namespace proc {
 namespace asset {
   
+  using boost::format;
+  
+  using lib::Symbol;
+  using util::isnil;
+  using util::contains;
+  using lumiera::query::LUMIERA_ERROR_CAPABILITY_QUERY;
+  using lumiera::query::extractID;
+  
+  using proc::mobject::Session;
+  using proc::mobject::MObject;
+  using proc::mobject::session::Scope;
+  using proc::mobject::session::match_specificTrack;
+  using proc::mobject::session::RBinding;
+  using proc::mobject::session::RTrack;
+  
   using idi::StructTraits;
   
+  
   namespace {
     
     Symbol genericIdSymbol ("id");
@@ -107,7 +110,7 @@ namespace asset {
        */
       template<class STRU>
       const Asset::Ident
-      createIdent (const Query<STRU>& query)
+      createIdent (Query<STRU> const& query)
         {
           // does the query somehow specify the desired name-ID?
           string nameID = extractID (genericIdSymbol, query);
@@ -173,10 +176,10 @@ namespace asset {
        *  @todo a real implementation using a resolution engine.
        */
       template<class STRU>
-      STRU* fabricate (const Query<STRU>& caps)
+      STRU* fabricate (Query<STRU> const& caps)
         {
-        throw lumiera::error::Config ( str(format("The following Query could not be resolved: %s.") % caps.asKey())
-                                     , LUMIERA_ERROR_CAPABILITY_QUERY );
+        throw error::Config ( str(format("The following Query could not be resolved: %s.") % caps.asKey())
+                            , LUMIERA_ERROR_CAPABILITY_QUERY );
         }
       
     };
@@ -186,7 +189,7 @@ namespace asset {
   
   template<>
   inline const ProcPatt* 
-  StructFactoryImpl::fabricate (const Query<const ProcPatt>& caps)
+  StructFactoryImpl::fabricate (Query<const ProcPatt> const& caps)
   {
     TODO ("actually extract properties/capabilities from the query...");
     return new ProcPatt (createIdent (caps));
@@ -194,7 +197,7 @@ namespace asset {
   
   template<>
   inline Pipe* 
-  StructFactoryImpl::fabricate (const Query<Pipe>& caps)
+  StructFactoryImpl::fabricate (Query<Pipe> const& caps)
   {
     const Asset::Ident idi (createIdent (caps));
     string streamID = extractID ("stream", caps);
@@ -208,7 +211,7 @@ namespace asset {
   
   template<>
   inline Timeline* 
-  StructFactoryImpl::fabricate (const Query<Timeline>& caps)
+  StructFactoryImpl::fabricate (Query<Timeline> const& caps)
   {
     TODO ("extract additional properties/capabilities from the query...");
     const Asset::Ident idi (createIdent (caps));
@@ -225,7 +228,7 @@ namespace asset {
   
   template<>
   inline Sequence* 
-  StructFactoryImpl::fabricate (const Query<Sequence>& caps)
+  StructFactoryImpl::fabricate (Query<Sequence> const& caps)
   {
     // when we reach this point it is clear a suitable sequence doesn't yet exist in the model
     TODO ("actually extract properties/capabilities from the query...");
@@ -244,5 +247,5 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/struct-scheme.hpp

@@ -45,6 +45,7 @@
 using boost::format;
 
 
+namespace proc {
 namespace mobject {
 namespace session {
   
@@ -166,5 +167,5 @@ namespace asset{
     }
     
     
-}} // namespace asset::idi
+}}} // namespace asset::idi
 #endif

src/proc/asset/struct.cpp

@@ -43,6 +43,7 @@ using lumiera::ConfigRules;
 using util::contains;
 
 
+namespace proc {
 namespace asset {
   
   /****** NOTE: not fully implemented yet. What follows is partially a hack to build simple tests *******/
@@ -154,7 +155,7 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace asset
 
 
 
@@ -169,6 +170,7 @@ namespace asset {
 #include "proc/asset/sequence.hpp"
 
 
+namespace proc {
 namespace asset {
   
   template P<Pipe>     StructFactory::operator() (Query<Pipe> const&);
@@ -186,4 +188,4 @@ namespace asset {
   template PTimeline   StructFactory::made4fake   (Query<Timeline> const&);      
   template PSequence   StructFactory::made4fake   (Query<Sequence>const&);       
   
-} // namespace asset
+}} // namespace asset

src/proc/asset/struct.hpp

@@ -68,6 +68,7 @@
 
 
 
+namespace proc {
 namespace asset {
   
   using std::string;
@@ -161,5 +162,5 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/timeline.cpp

@@ -29,6 +29,7 @@
 #include "proc/assetmanager.hpp"
 
 
+namespace proc {
 namespace asset {
   
   using lib::AutoRegistered;
@@ -69,4 +70,4 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace asset

src/proc/asset/timeline.hpp

@@ -67,6 +67,7 @@
 //using std::vector;
 //using std::string;
 
+namespace proc {
 namespace mobject {
 namespace session {
   
@@ -78,9 +79,8 @@ namespace session {
 namespace asset {
   
   
-//  using lumiera::P;
   class Timeline;
-  typedef lumiera::P<Timeline> PTimeline;
+  typedef P<Timeline> PTimeline;
   
   
   /**
@@ -111,5 +111,5 @@ namespace asset {
 ///////////////////////////TODO currently just fleshing the API
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/typed-id.hpp

@@ -75,6 +75,7 @@ namespace query  {
   
 }}
 
+namespace proc {
 namespace asset {
   
 //  using std::string;
@@ -132,5 +133,5 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/typed-lookup.cpp

@@ -24,6 +24,7 @@
 #include "proc/asset/typed-id.hpp"
 
 
+namespace proc {
 namespace asset {
   
   LUMIERA_ERROR_DEFINE (MISSING_INSTANCE, "Existing ID registration without associated instance");
@@ -33,4 +34,4 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace asset

src/proc/asset/unknown.cpp

@@ -27,6 +27,7 @@
 
 using boost::format;
 
+namespace proc {
 namespace asset {
   
   LUMIERA_ERROR_DEFINE (ORIG_NOT_FOUND, "Media referred by placeholder not found");
@@ -49,7 +50,7 @@ namespace asset {
    *  try to access the "real" media it stands for.
    */
   Media::PMedia 
-  Unknown::getOrg()  throw(lumiera::error::Invalid)
+  Unknown::getOrg()
   {
     UNIMPLEMENTED ("how to get at the original media from a »Unknown« placeholder");
     if (1==0)
@@ -63,4 +64,4 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace asset

src/proc/asset/unknown.hpp

@@ -29,6 +29,7 @@
 
 
 
+namespace proc {
 namespace asset {
   
   using lib::time::FSecs;
@@ -49,7 +50,7 @@ namespace asset {
       friend class MediaFactory;
       
     public:
-      virtual Media::PMedia getOrg()  throw(lumiera::error::Invalid);
+      virtual Media::PMedia getOrg();
       
     };
   
@@ -58,5 +59,5 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/asset/viewer.cpp

@@ -29,6 +29,7 @@
 //#include "proc/assetmanager.hpp"
 
 
+namespace proc {
 namespace asset {
   
 //  using lib::AutoRegistered;
@@ -67,4 +68,4 @@ namespace asset {
   
   
   
-} // namespace asset
+}} // namespace proc::asset

src/proc/asset/viewer.hpp

@@ -62,6 +62,7 @@
 //using std::vector;
 //using std::string;
 
+namespace proc {
 namespace mobject {
 namespace session {
   
@@ -73,9 +74,8 @@ namespace session {
 namespace asset {
   
   
-  using lumiera::P;
   class Viewer;
-  typedef lumiera::P<Viewer> PViewer;
+  typedef P<Viewer> PViewer;
   
   
   /**
@@ -103,5 +103,5 @@ namespace asset {
 ///////////////////////////TODO currently just fleshing the API
   
   
-} // namespace asset
+}} // namespace proc::asset
 #endif

src/proc/assetmanager.cpp

@@ -40,6 +40,7 @@ using lib::Singleton;
 using lib::Sync;
 
 
+namespace proc {
 namespace asset {
   
   /** 
@@ -220,7 +221,7 @@ namespace asset {
   }
   
   
-} // namespace asset
+}} // namespace proc::asset
 
 
 
@@ -240,7 +241,7 @@ namespace asset {
 #include "proc/asset/sequence.hpp"
 #include "proc/asset/meta/time-grid.hpp"
 
-
+namespace proc {
 namespace asset {
   
   template ID<Asset> AssetManager::reg (Asset* obj, const Asset::Ident& idi);
@@ -265,4 +266,4 @@ namespace asset {
   template P<TimeGrid> AssetManager::wrap (const TimeGrid& asset);
   
   
-} // namespace asset
+}} // namespace proc::asset

src/proc/assetmanager.hpp

@@ -52,7 +52,7 @@ using std::string;
 using std::list;
 
 
-
+namespace proc {
 namespace asset {
   
   class DB;
@@ -120,13 +120,13 @@ namespace asset {
     LUMIERA_ERROR_DECLARE (UNKNOWN_ASSET_ID);  ///< use of a non-registered Asset ID.
     LUMIERA_ERROR_DECLARE (WRONG_ASSET_KIND);  ///< Asset ID of wrong Asset kind, unable to cast.
 
-} // namespace asset
+}} // namespace proc::asset
 
 
 
 namespace proc_interface
   {
-  using asset::AssetManager;
+  using proc::asset::AssetManager;
 }
 
 #endif

src/proc/common.hpp

@@ -41,7 +41,7 @@
 
 
 
-    /* common types frequently used... */
+    /*  frequently used common types... */
 
 #include "lib/p.hpp"
 #include "lib/util.hpp"
@@ -60,7 +60,7 @@ namespace lumiera {
 
   /* additional global configuration goes here... */
   
-    
+  
 } // namespace lumiera
 
 
@@ -68,54 +68,75 @@ namespace lumiera {
  * Implementation namespace for support and library code.
  */
 namespace lib { 
-
+  
 }
 
 
 /**
- * The asset subsystem of the Proc-Layer.
- * @todo refactor proc namespaces
+ * Proc-Layer implementation namespace root.
+ * Lumiera's middle layer contains the core models, both
+ * high-level (session) and low-level (render nodes), together with
+ * the Builder to translate between those two models, the command frontend,
+ * session support system, the playback-and-render-control subsystem and
+ * the API and backbone of the renderengine. Most render implementation
+ * code resides in the backend or is loaded from plug-ins though.
  */
-namespace asset { }
-
-
-/**
- * Proc-Layer dispatcher, controller and administrative facilities.
- * @todo refactor proc namespaces
- */
-namespace control { }
-
-
-/**
- * Render engine code as part of the Proc-Layer.
- * Backbone of the engine, render nodes base and cooperation.
- * A good deal of the active engine code is outside the scope of the
- * Proc-Layer, e.g. code located in backend services and plugins.
- * @todo refactor proc namespaces
- */
-namespace engine { }
-
-
-
-/**
- * Media-Objects, edit operations and high-level session.
- * @todo is this interface or implementation ??
- * @todo refactor proc namespaces
- */
-namespace mobject {
-
-
+namespace proc { 
+  
+  
+  
   /**
-   * Namespace of Session and user visible high-level objects.
+   * The asset subsystem of the Proc-Layer.
    */
-  namespace session { }
-
-
+  namespace asset { }
+  
+  
   /**
-   * Namespace of the Builder, transforming high-level into low-level.
+   * Proc-Layer dispatcher, controller and administrative facilities.
    */
-  namespace builder { }
-
-}
+  namespace control { }
+  
+  
+  /**
+   * Playback and rendering control subsystem.
+   * The so called "player" combines and orchestrates services from
+   * the engine, session and backend to perform playback or rendering
+   */
+  namespace play { 
+    
+  }
+  
+  
+  /**
+   * Render engine code as part of the Proc-Layer.
+   * Backbone of the engine, render nodes base and cooperation.
+   * A good deal of the active engine code is outside the scope of the
+   * Proc-Layer, e.g. code located in backend services and plugins.
+   */
+  namespace engine { }
+  
+  
+  
+  /**
+   * Media-Objects, edit operations and high-level session.
+   * @todo is this interface or implementation ??
+   */
+  namespace mobject {
+  
+  
+    /**
+     * Namespace of Session and user visible high-level objects.
+     */
+    namespace session { }
+  
+  
+    /**
+     * Namespace of the Builder, transforming high-level into low-level.
+     */
+    namespace builder { }
+  
+  }
+  
+} // proc
 
 #endif /*LUMIERA_H*/

src/proc/control/mediaimpllib.hpp

@@ -25,7 +25,7 @@
 #define CONTROL_MEDIAIMPLLIB_H
 
 
-#include "lib/streamtype.hpp"
+#include "proc/streamtype.hpp"
 
 
 

src/proc/control/stypemanager.cpp

@@ -29,7 +29,6 @@
 
 namespace control {
   
-  using lumiera::StreamType;
   using lib::Symbol;
   
   /* ======= stream type manager lifecycle ==========*/

src/proc/control/stypemanager.hpp

@@ -25,7 +25,7 @@
 #define CONTROL_STYPEMANAGER_H
 
 
-#include "lib/streamtype.hpp"
+#include "proc/streamtype.hpp"
 #include "lib/singleton.hpp"
 
 #include <boost/scoped_ptr.hpp>
@@ -34,7 +34,6 @@
 namespace control {
   
   using lib::Symbol;
-  using lumiera::StreamType;
   
   
   class STypeManager

src/proc/control/styperegistry.hpp

@@ -50,7 +50,7 @@
 
 namespace control {
 
-//  using lumiera::P;
+//  using lib::P;
 //  using lumiera::Query;
   
 //  using std::string;

src/proc/controllerfacade.cpp

@@ -23,8 +23,7 @@
 
 #include "proc/controllerfacade.hpp"
 
-namespace proc_interface
-  {
+namespace proc_interface {
 
   /** */
 

src/proc/engine/buffer-local-key.hpp

@@ -34,6 +34,7 @@ namespace lib {
   typedef size_t HashVal;
 }
 
+namespace proc {
 namespace engine {
   
   namespace metadata {
@@ -124,5 +125,5 @@ namespace engine {
     };
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/buffer-metadata.hpp

@@ -65,6 +65,7 @@
 #include <boost/noncopyable.hpp>
 
 
+namespace proc {
 namespace engine {
   
   using lib::HashVal;
@@ -789,5 +790,5 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/buffer-provider.cpp

@@ -28,6 +28,7 @@
 
 using util::isSameObject;
 
+namespace proc {
 namespace engine {
   
   
@@ -312,4 +313,4 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace engine

src/proc/engine/buffer-provider.hpp

@@ -52,6 +52,7 @@
 #include <boost/scoped_ptr.hpp>
 
 
+namespace proc {
 namespace engine {
   
   using boost::scoped_ptr;
@@ -165,5 +166,5 @@ namespace engine {
   }
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/buffhandle-attach.hpp

@@ -50,6 +50,7 @@
 #include "proc/engine/buffhandle.hpp"
 
 
+namespace proc {
 namespace engine {
   
   
@@ -125,5 +126,5 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/buffhandle.hpp

@@ -52,13 +52,14 @@
 
 
 #include "lib/error.hpp"
-#include "lib/streamtype.hpp"
+#include "proc/streamtype.hpp"
 #include "lib/bool-checkable.hpp"
 
 
+namespace proc {
 namespace engine {
   
-  namespace error = lumiera::error;
+  namespace error = ::lumiera::error;
   using error::LUMIERA_ERROR_LIFECYCLE;
   
   typedef size_t HashVal;           ////////////TICKET #722
@@ -110,7 +111,7 @@ namespace engine {
   class BuffHandle
     : public lib::BoolCheckable<BuffHandle>
     {
-      typedef lumiera::StreamType::ImplFacade::DataBuffer Buff;
+      typedef StreamType::ImplFacade::DataBuffer Buff;
       
       BufferDescriptor descriptor_;
       Buff* pBuffer_; 
@@ -180,5 +181,5 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/bufftable-obsolete.hpp

@@ -38,6 +38,7 @@
 ////////////////////////////////WARNING: ...just left in tree to keep it compiling
 ////////////////////////////////TICKET   #826  need to be reworked entirely
 
+namespace proc {
 namespace engine {
   
   using std::pair;
@@ -183,5 +184,5 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/bufftable.hpp

@@ -36,6 +36,7 @@
 
 
 
+namespace proc {
 namespace engine {
   
   using std::pair;
@@ -154,5 +155,5 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/channel-descriptor.hpp

@@ -37,10 +37,11 @@
 
 
 #include "lib/error.hpp"
-#include "lib/streamtype.hpp"
+#include "proc/streamtype.hpp"
 #include "lib/bool-checkable.hpp"
 
 
+namespace proc {
 namespace engine {
   
   namespace error = lumiera::error;
@@ -71,5 +72,5 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/diagnostic-buffer-provider.cpp

@@ -28,6 +28,7 @@
 #include "proc/engine/tracking-heap-block-provider.hpp"
 
 
+namespace proc {
 namespace engine {
   
   
@@ -104,4 +105,4 @@ namespace engine {
     }
   
 
-} // namespace engine
+}} // namespace engine

src/proc/engine/diagnostic-buffer-provider.hpp

@@ -40,6 +40,7 @@
 #include <boost/noncopyable.hpp>
 
 
+namespace proc {
 namespace engine {
   
   namespace error = lumiera::error;
@@ -106,5 +107,5 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/dispatcher.cpp

@@ -27,6 +27,7 @@
 
 
 
+namespace proc {
 namespace engine {
   
   /** */
@@ -34,4 +35,4 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace engine

src/proc/engine/dispatcher.hpp

@@ -30,6 +30,7 @@
 
 
 
+namespace proc {
 namespace engine {
   
   using lib::time::TimeSpan;
@@ -58,5 +59,5 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/link.cpp

@@ -23,6 +23,7 @@
 
 #include "proc/engine/link.hpp"
 
+namespace proc {
 namespace engine
   {
 
@@ -31,4 +32,4 @@ namespace engine
 
 
 
-} // namespace engine
+  }} // namespace engine

src/proc/engine/link.hpp

@@ -28,8 +28,8 @@
 
 
 
-namespace engine
-  {
+namespace proc {
+namespace engine {
 
 
   /**
@@ -50,5 +50,5 @@ namespace engine
 
 
 
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/mask.cpp

@@ -23,12 +23,12 @@
 
 #include "proc/engine/mask.hpp"
 
-namespace engine
-  {
+namespace proc {
+namespace engine {
 
   /** */
 
 
 
 
-} // namespace engine
+}} // namespace engine

src/proc/engine/mask.hpp

@@ -28,6 +28,7 @@
 
 
 
+namespace proc {
 namespace engine
   {
 
@@ -38,5 +39,5 @@ namespace engine
 
 
 
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/nodefactory.cpp

@@ -27,6 +27,7 @@
 
 #include "proc/engine/nodewiring.hpp"
 
+namespace proc {
 namespace engine {
   
   namespace { // Details of node fabrication
@@ -53,4 +54,4 @@ namespace engine {
   }
 
 
-} // namespace engine
+}} // namespace engine

src/proc/engine/nodefactory.hpp

@@ -33,6 +33,7 @@
 
 namespace lib { class AllocationCluster; }
 
+namespace proc {
 namespace mobject {
 namespace session {
   
@@ -75,5 +76,5 @@ namespace engine {
         
     };
 
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/nodeinvocation.hpp

@@ -61,6 +61,7 @@
 
 
 
+namespace proc {
 namespace engine {
   
   
@@ -232,5 +233,5 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/nodeoperation.hpp

@@ -70,6 +70,7 @@
 
 
 
+namespace proc {
 namespace engine {
 namespace config {
   

src/proc/engine/nodewiring-config.hpp

@@ -60,6 +60,7 @@
 #include <map>
 
 
+namespace proc {
 namespace engine {
 namespace config {
   

src/proc/engine/nodewiring-def.hpp

@@ -50,6 +50,7 @@
 
 
 
+namespace proc {
 namespace engine {
   
   using lib::RefArray;
@@ -184,5 +185,5 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/nodewiring.cpp

@@ -29,6 +29,7 @@
 #include "lib/meta/typelist-manip.hpp"
 
 
+namespace proc {
 namespace engine {
 
   namespace config {
@@ -149,4 +150,4 @@ namespace engine {
   }
   
   
-} // namespace engine
+}} // namespace engine

src/proc/engine/nodewiring.hpp

@@ -35,6 +35,7 @@
 
 
 
+namespace proc {
 namespace engine {
   
   
@@ -96,5 +97,5 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/pluginadapter.cpp

@@ -23,12 +23,12 @@
 
 #include "proc/engine/pluginadapter.hpp"
 
-namespace engine
-  {
+namespace proc {
+namespace engine {
 
   /** */
 
 
 
 
-} // namespace engine
+}} // namespace engine

src/proc/engine/pluginadapter.hpp

@@ -28,6 +28,7 @@
 
 
 
+namespace proc {
 namespace engine
   {
 
@@ -44,5 +45,5 @@ namespace engine
 
 
 
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/procnode.hpp

@@ -53,6 +53,7 @@
 
 
 
+namespace proc {
 namespace engine {
 
   using std::vector;
@@ -172,5 +173,5 @@ namespace engine {
   }
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/render-invocation.cpp

@@ -25,6 +25,7 @@
 #include "proc/engine/stateproxy.hpp"
 
 
+namespace proc {
 namespace engine {
   
   namespace { // Details...
@@ -55,4 +56,4 @@ namespace engine {
   }
   
   
-} // namespace engine
+}} // namespace engine

src/proc/engine/render-invocation.hpp

@@ -42,6 +42,7 @@
 
 
 
+namespace proc {
 namespace engine {
   
   
@@ -74,5 +75,5 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/renderengine.cpp

@@ -23,6 +23,7 @@
 
 #include "proc/engine/renderengine.hpp"
 
+namespace proc {
 namespace engine {
   
   
@@ -30,4 +31,4 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace engine

src/proc/engine/renderengine.hpp

@@ -37,6 +37,7 @@ using std::list;
 
 //////////TODO for the "real" engine API: look at engine-serivce.hpp
 
+namespace proc {
 namespace engine {
   
   
@@ -59,5 +60,5 @@ namespace engine {
       
     };
 
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/rendergraph.cpp

@@ -32,6 +32,7 @@ namespace lumiera {
 }
 
 
+namespace proc {
 namespace engine {
   
   /** */
@@ -39,4 +40,4 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace engine

src/proc/engine/rendergraph.hpp

@@ -34,6 +34,7 @@
 /////////////////////////////TODO consequently this will become some kind of root or anchor point for this network
 
 
+namespace proc {
 namespace engine {
   
   using lib::time::TimeSpan;
@@ -64,5 +65,5 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/source.cpp

@@ -23,6 +23,7 @@
 
 #include "proc/engine/source.hpp"
 
+namespace proc {
 namespace engine
   {
 
@@ -31,4 +32,4 @@ namespace engine
 
 
 
-} // namespace engine
+}} // namespace engine

src/proc/engine/source.hpp

@@ -28,6 +28,7 @@
 
 
 
+namespace proc {
 namespace engine
   {
 
@@ -47,5 +48,5 @@ namespace engine
 
 
 
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/stateproxy.cpp

@@ -23,6 +23,7 @@
 
 #include "proc/engine/stateproxy.hpp"
 
+namespace proc {
 namespace engine {
   
   
@@ -84,4 +85,4 @@ namespace engine {
   }
   
   
-} // namespace engine
+}} // namespace engine

src/proc/engine/stateproxy.hpp

@@ -28,6 +28,7 @@
 #include "proc/state.hpp"
 
 
+namespace proc {
 namespace engine {
 
 
@@ -56,5 +57,5 @@ namespace engine {
     
     
     
-} // namespace engine
+}} // namespace proc::engine
 #endif

src/proc/engine/tracking-heap-block-provider.cpp

@@ -43,6 +43,7 @@ using lib::ScopedPtrVect;
 
 
 
+namespace proc {
 namespace engine {
   
   namespace error = lumiera::error;
@@ -322,4 +323,4 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace engine

src/proc/engine/tracking-heap-block-provider.hpp

@@ -52,6 +52,7 @@
 #include <boost/scoped_array.hpp>
 
 
+namespace proc {
 namespace engine {
   
   namespace error = lumiera::error;
@@ -183,5 +184,5 @@ namespace engine {
   
   
   
-} // namespace engine
+}} // namespace proc::engine
 #endif