Changeset 82 for CMT/HEAD

Timestamp:

Sep 5, 2005, 10:45:59 AM (19 years ago)

Author:

arnault

Message:

Make include_dirs subject to private sections - see CL#277

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/cmt.nmake (modified) (1 diff)
• mgr/cmt_buildcvsinfos2.sh (modified) (2 diffs)
• source/cmt_include.cxx (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2005-09-05  Christian Arnault  <arnault@lal.in2p3.fr> 277
+
+        * mgr/cmt_buildcvsinfos2.sh (module): Adapt to the new syntax by adding the protocol level.
+
+        * source/cmt_include.cxx (action): Submit include_dirs statement to private scoping
+
 2005-09-01  Christian Arnault  <arnault@lal.in2p3.fr> 276
 

CMT/HEAD/mgr/cmt.nmake

@@ -3 +3 @@
 #  Application cmt
 #
-#   Generated Wed Aug 31 17:37:50 2005  by carnault
+#   Generated Thu Sep 01 15:10:41 2005  by carnault
 #
 #====================================

CMT/HEAD/mgr/cmt_buildcvsinfos2.sh

@@ -10 +10 @@
 # ...
 #
-# and is used whenever one tries to import a module named .cmtcvsinfos/<module>
+# and is used whenever one tries to import a module named .cmtcvsinfos/<protocol-level>/<module>
 #
 #---------------------------------------------------------------------
@@ -223 +223 @@
 
 root=$CVSROOT
-
-module=`echo $a | sed -e "s#.*[.]cmtcvsinfos/##"`
+protocol_level=v1r1
+
+module=`echo $a | sed -e "s#.*[.]cmtcvsinfos/${protocol_level}/##"`
 error=
 

CMT/HEAD/source/cmt_include.cxx

@@ -31 +31 @@
 
   if (use == 0) use = &(Use::current());
+
+  if (Cmt::get_current_access () == UserMode)
+    {
+      if (use->get_current_scope () == ScopePrivate) return;
+    }
 
   for (int i = 1; i < words.size (); i++)