|
Last change
on this file since a71ad8 was 0647f4, checked in by Frederik Heber <heber@…>, 15 years ago |
|
Merge branch 'StateAndFormatParser' into CommandLineActionMapping
Conflicts:
molecuilder/src/Makefile.am
molecuilder/src/tesselation.cpp
molecuilder/src/unittests/Makefile.am
The following conflicts had to be resolved:
- molecuilder/src/Makefile.am had an old version of the HEADER definition which would not be merged automatically. ${PARSERHEADER} was missing.
- molecuilder/src/unittests/Makefile.am had an blank line too much
- TesselPoint::TesselPoint() had an older version where TesselPoint::Name was initialized to "-" instead of NULL. The latter should be correct due to missing delete(Name) in destructor.
- compilation errors arose due to the private nature of Vector::x[] introduced in the branch VectorRefactoring. This has been fixed in XyzParser, TremoloParser and the ParserUnitTest.
- ParserUnitTest runs fine.
Signed-off-by: Frederik Heber <heber@…>
|
-
Property mode
set to
100644
|
|
File size:
833 bytes
|
| Line | |
|---|
| 1 | /*
|
|---|
| 2 | * atom_particleinfo.cpp
|
|---|
| 3 | *
|
|---|
| 4 | * Created on: Oct 19, 2009
|
|---|
| 5 | * Author: heber
|
|---|
| 6 | */
|
|---|
| 7 |
|
|---|
| 8 | #include "atom_particleinfo.hpp"
|
|---|
| 9 | #include "memoryallocator.hpp"
|
|---|
| 10 |
|
|---|
| 11 | /** Constructor of ParticleInfo.
|
|---|
| 12 | */
|
|---|
| 13 | ParticleInfo::ParticleInfo() : nr(-1), Name(NULL) {};
|
|---|
| 14 |
|
|---|
| 15 | ParticleInfo::ParticleInfo(ParticleInfo *pointer) :
|
|---|
| 16 | nr(pointer->nr),
|
|---|
| 17 | Name(pointer->Name)
|
|---|
| 18 | {
|
|---|
| 19 | if (Name == NULL)
|
|---|
| 20 | Name = " ";
|
|---|
| 21 | }
|
|---|
| 22 |
|
|---|
| 23 |
|
|---|
| 24 | /** Destructor of ParticleInfo.
|
|---|
| 25 | */
|
|---|
| 26 | ParticleInfo::~ParticleInfo()
|
|---|
| 27 | {
|
|---|
| 28 | Free(&Name);
|
|---|
| 29 | };
|
|---|
| 30 |
|
|---|
| 31 | ostream & operator << (ostream &ost, const ParticleInfo &a)
|
|---|
| 32 | {
|
|---|
| 33 | if (a.Name == NULL)
|
|---|
| 34 | ost << "[NULL]";
|
|---|
| 35 | else
|
|---|
| 36 | ost << "[" << a.Name << "|" << &a << "]";
|
|---|
| 37 | return ost;
|
|---|
| 38 | };
|
|---|
| 39 |
|
|---|
| 40 | ostream & ParticleInfo::operator << (ostream &ost) const
|
|---|
| 41 | {
|
|---|
| 42 | if (Name == NULL)
|
|---|
| 43 | ost << "[NULL]";
|
|---|
| 44 | else
|
|---|
| 45 | ost << "[" << Name << "|" << this << "]";
|
|---|
| 46 | return ost;
|
|---|
| 47 | };
|
|---|
| 48 |
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
