Changeset 9537ecf in tol

Timestamp:

Sep 1, 2009, 9:23:43 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

fe0ab5b

Parents:

be4a94b

Message:

Disabling USE_STATIC_INHERITAGE

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1309 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/bgrammar/class.cpp (modified) (2 diffs)

tol/btol/bgrammar/class.cpp

@@ -631 +631 @@
 }
 
+//#define USE_STATIC_INHERITAGE
+
 //--------------------------------------------------------------------
   bool BMemberOwner::AddMember(BMember* newMember)
@@ -637 +639 @@
 {
   if(!isGood_) { return(false); }
+  const BText& dec  = newMember->declaration_;
+  const BText& name = newMember->name_;
+  assert(name.HasName()&& dec.HasName());
+#ifndef USE_STATIC_INHERITAGE
+  if(newMember->isStatic_ && (newMember->parent_!=this)) 
+  {
+    return(true);
+  }
+#endif
   if(!memberHash_) { CreateMemberHashes(); }
   BMbrNum* newMbrNum = new BMbrNum;
   newMbrNum->member_ = newMember;
   newMbrNum->position_ = lastPosition_++;
-  const BText& dec  = newMember->declaration_;
-  const BText& name = newMember->name_;
-  assert(name.HasName()&& dec.HasName());
   bool ok = true;
   bool  hasDefVal = newMember->HasDefVal();