Changeset 2695

Timestamp:

01/31/07 16:31:07 (6 years ago)

Author:

phelps

Message:

Manually apply r2540 from trunk.

Location:

ossie/branches/ossie-0.6.0/ossie

Files:

• framework/DomainManager_impl.cpp (modified) (2 diffs)
• include/ossie/DomainManager_impl.h (modified) (2 diffs)

ossie/branches/ossie-0.6.0/ossie/framework/DomainManager_impl.cpp

@@ -47 +47 @@
 using namespace std;
 
-DomainManager_impl::DomainManager_impl (int argc, char **argv)
+DomainManager_impl::DomainManager_impl (int argc, const char **argv)
 {
   init(argc, argv);
@@ -87 +87 @@
 
 void
-DomainManager_impl::init (int argc, char **argv)
+DomainManager_impl::init (int argc, const char **argv)
 {
 

ossie/branches/ossie-0.6.0/ossie/include/ossie/DomainManager_impl.h

@@ -94 +94 @@
     PropertySet_impl
     {
-        public:DomainManager_impl (int argc, char **argv);
+        public:DomainManager_impl (int argc, const char **argv);
         ~
             DomainManager_impl ();
@@ -304 +304 @@
     private:
         DomainManager_impl(DomainManager_impl &); // No copying
-        void init (int, char **);
+        void init (int, const char **);