summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2005-04-15 17:55:46 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2005-04-15 17:55:46 +0000
commit63fd0b335ff33a2ceff6cbcada5690802033f5a4 (patch)
tree28dd95f9da76c5e1eb3e96bd82d2b64ab1428477
parentaaaa81ffcfe8e4e4837c06a95aad3ead03bbd606 (diff)
downloadATCD-63fd0b335ff33a2ceff6cbcada5690802033f5a4.tar.gz
Fri Apr 15 12:54:46 CDT 2005 Will Otte <wotte@dre.vanderbilt.edu>
-rw-r--r--TAO/CIAO/ChangeLog6
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/Req_Handler.h3
2 files changed, 7 insertions, 2 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 2baf8f953b2..c8b75c23b27 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 15 12:54:46 CDT 2005 Will Otte <wotte@dre.vanderbilt.edu>
+
+ * DAnCE/Config_Handlers/Req_Handler.h
+
+ Fixed a compile error on builds using -pendantic.
+
Fri Apr 15 10:46:56 CDT 2005 Gan Deng <dengg@dre.vanderbilt.edu>
* DAnCE/ciao/Container_Impl.cpp
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Req_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/Req_Handler.h
index 1f581c2e4a5..6f58f8677e4 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Req_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Req_Handler.h
@@ -54,8 +54,7 @@ namespace CIAO
Deployment::Requirement& toconfig,
Requirement& desc);
static Requirement
- Req_Handler::get_requirement (
- const Deployment::Requirement& src);
+ get_requirement (const Deployment::Requirement& src);
};
}
}