[Csp-commits] APPLICATIONS/SimData/Source DataArchive.cpp,1.15.2.3,1.15.2.4 Link.cpp,1.6.2.1,1.6.2.2 Object.cpp,1.6.2.1,1.6.2.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv12171/Source

Modified Files:
      Tag: b0_4_0
	DataArchive.cpp Link.cpp Object.cpp 
Log Message:


Index: DataArchive.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/DataArchive.cpp,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -C2 -d -r1.15.2.3 -r1.15.2.4
*** DataArchive.cpp	18 Sep 2003 02:09:49 -0000	1.15.2.3
--- DataArchive.cpp	17 Oct 2003 21:33:55 -0000	1.15.2.4
***************
*** 395,401 ****
  		throw CorruptArchive("Object extraction incomplete for class '" + std::string(dup->getClassName()) + "'");
  	}
! 	if (dup->isStatic()) {
  		_addStatic(dup, "", id);
- 		// XXX dup->ref(); // we own a copy
  	}
  	return LinkBase(path, dup);
--- 395,400 ----
  		throw CorruptArchive("Object extraction incomplete for class '" + std::string(dup->getClassName()) + "'");
  	}
! 	if (proxy->isStatic()) {
  		_addStatic(dup, "", id);
  	}
  	return LinkBase(path, dup);

Index: Link.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Link.cpp,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -d -r1.6.2.1 -r1.6.2.2
*** Link.cpp	22 Aug 2003 00:21:45 -0000	1.6.2.1
--- Link.cpp	17 Oct 2003 21:33:55 -0000	1.6.2.2
***************
*** 70,73 ****
--- 70,74 ----
  	} else {
  		if (isNone()) {
+ 			// XXX should throw an exception
  			assert(!isNull());
  			hasht class_hash = _get()->getClassHash();
***************
*** 115,120 ****
  		Object* p = _reference;
  		assert(p);
! 		//printf("got %p (static=%d)\n", p, p->isStatic());
! 		SIMDATA_LOG(LOG_ARCHIVE, LOG_DEBUG, "got 0x" << std::hex << int(p) << " (static=" << p->isStatic() << ")");
  	}
  }
--- 116,120 ----
  		Object* p = _reference;
  		assert(p);
! 		SIMDATA_LOG(LOG_ARCHIVE, LOG_DEBUG, "got 0x" << std::hex << int(p) << ")");
  	}
  }

Index: Object.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Object.cpp,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -d -r1.6.2.1 -r1.6.2.2
*** Object.cpp	22 Aug 2003 00:21:45 -0000	1.6.2.1
--- Object.cpp	17 Oct 2003 21:33:55 -0000	1.6.2.2
***************
*** 29,50 ****
  
  
! void Object::serialize(Archive& archive) {
! 	archive(_static);
! }
! 
! // static management (don't touch!)
! void Object::setStatic(bool s) { 
! 	_static = s;
! }
! 
! bool Object::isStatic() const { 
! 	return _static; 
  }
  
! Object::Object(): Referenced(), BaseType(), _static(false), _path(0) {
  }
  
  Object::~Object() { 
! 	//printf("~Object %p\n", this); 
  }
  
--- 29,40 ----
  
  
! void Object::serialize(Archive&) {
  }
  
! Object::Object(): Referenced(), BaseType(), _path(0) {
  }
  
  Object::~Object() { 
! 	//std::cerr << "~Object 0x" << std::hex << static_cast<unsigned int>(this) << "\n"; 
  }