diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-06-16 01:17:03 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-06-16 01:17:03 +0000 |
| commit | 4d0dad8e183953600e460532a24b2c8be5cb2470 (patch) | |
| tree | af87867989ef25cbce55717df12d71916100c431 | |
| parent | 20bfe7729f627c91b3b05fa1cfb5691e56a0bb62 (diff) | |
| download | ATCD-4d0dad8e183953600e460532a24b2c8be5cb2470.tar.gz | |
Wed Jun 16 01:16:25 UTC 2010 William Otte <wotte@zifnab>
* DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.inl:
* DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h:
Compile fix for OS X.
| -rw-r--r-- | CIAO/ChangeLog | 7 | ||||
| -rw-r--r-- | CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h | 2 | ||||
| -rw-r--r-- | CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.inl | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index c4a87757d81..8f64c98ea9d 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Jun 16 01:16:25 UTC 2010 William Otte <wotte@zifnab> + + * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.inl: + * DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h: + + Compile fix for OS X. + Tue Jun 15 22:36:10 UTC 2010 Martin Corino <mcorino@remedy.nl> Finishing integration of artifact installation. diff --git a/CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h b/CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h index 8d4242022e7..1e77e80a23a 100644 --- a/CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h +++ b/CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.h @@ -52,7 +52,7 @@ namespace DAnCE TVersions& versions (); const TVersions& versions () const; - ulong install_count () const; + u_long install_count () const; void increment_install_count (); void decrement_install_count (); diff --git a/CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.inl b/CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.inl index 5267846af2c..756e9fdde98 100644 --- a/CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.inl +++ b/CIAO/DAnCE/tools/Artifact_Installation/Artifact_Installation_Impl.inl @@ -57,7 +57,7 @@ namespace DAnCE } ACE_INLINE - ulong ArtifactRegistry::install_count () const + u_long ArtifactRegistry::install_count () const { return this->install_count_; } |