ChangeLogTag:Sun Jan 20 12:25:28 2002 Balachandran Natarajan <bala@cs.wustl.edu>

8 files changed, 83 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 556cf3f1959..9636c3cf1b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Sun Jan 20 12:25:28 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* ace/Framework_Component.h: Removed the the definition of the
+	  default constructor (in ACE_UNIMPLEMENTED_FUNC definition). The
+	  other private constructor with a default argument tends towards
+	  a default constructor. Not sure how g++ didnt signal this one. 
+	
+	* ace/Framework_Component_T.h: #include'd Framework_Component.h 
+	* ace/Framework_Component_T.cpp: Added a #ifndef around the file. 
+
+	* ace/ace_dll.dsp:
+	* ace/ace_lib.dsp: Added the Framwork_Component* files to the
+	  project file. 
+	
 Sun Jan 20 10:40:28 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tests/Vector_Test.dsp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 556cf3f1959..9636c3cf1b8 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,17 @@
+Sun Jan 20 12:25:28 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* ace/Framework_Component.h: Removed the the definition of the
+	  default constructor (in ACE_UNIMPLEMENTED_FUNC definition). The
+	  other private constructor with a default argument tends towards
+	  a default constructor. Not sure how g++ didnt signal this one. 
+	
+	* ace/Framework_Component_T.h: #include'd Framework_Component.h 
+	* ace/Framework_Component_T.cpp: Added a #ifndef around the file. 
+
+	* ace/ace_dll.dsp:
+	* ace/ace_lib.dsp: Added the Framwork_Component* files to the
+	  project file. 
+	
 Sun Jan 20 10:40:28 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tests/Vector_Test.dsp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 556cf3f1959..9636c3cf1b8 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,17 @@
+Sun Jan 20 12:25:28 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* ace/Framework_Component.h: Removed the the definition of the
+	  default constructor (in ACE_UNIMPLEMENTED_FUNC definition). The
+	  other private constructor with a default argument tends towards
+	  a default constructor. Not sure how g++ didnt signal this one. 
+	
+	* ace/Framework_Component_T.h: #include'd Framework_Component.h 
+	* ace/Framework_Component_T.cpp: Added a #ifndef around the file. 
+
+	* ace/ace_dll.dsp:
+	* ace/ace_lib.dsp: Added the Framwork_Component* files to the
+	  project file. 
+	
 Sun Jan 20 10:40:28 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tests/Vector_Test.dsp:
diff --git a/ace/Framework_Component.h b/ace/Framework_Component.h
index 00dd6bcc9f9..3cd7302f79b 100644
--- a/ace/Framework_Component.h
+++ b/ace/Framework_Component.h
@@ -146,7 +146,6 @@ private:
 #endif /* ACE_MT_SAFE */
 
   /// Don't allow these to be called.
-  ACE_UNIMPLEMENTED_FUNC (ACE_Framework_Repository (void))
   ACE_UNIMPLEMENTED_FUNC (ACE_Framework_Repository (const ACE_Framework_Repository &))
   ACE_UNIMPLEMENTED_FUNC (ACE_Framework_Repository &operator= (const ACE_Framework_Repository &))
 };
diff --git a/ace/Framework_Component_T.cpp b/ace/Framework_Component_T.cpp
index d58100080fa..54beb34780d 100644
--- a/ace/Framework_Component_T.cpp
+++ b/ace/Framework_Component_T.cpp
@@ -1,5 +1,7 @@
 // Framework_Component_T.cpp
 // $Id$
+#ifndef ACE_FRAMEWORK_COMPONENT_T_CPP
+#define ACE_FRAMEWORK_COMPONENT_T_CPP
 
 #include "ace/Framework_Component_T.h"
 
@@ -22,3 +24,5 @@ ACE_Framework_Component_T<Concrete>::~ACE_Framework_Component_T (void)
   ACE_TRACE ("ACE_Framework_Component_T<Concrete>::dtor");
   Concrete::close_singleton ();
 }
+
+#endif /*ACE_FRAWORK_COMPONENT_T_CPP*/
diff --git a/ace/Framework_Component_T.h b/ace/Framework_Component_T.h
index 541aa8285cd..90fff2a877b 100644
--- a/ace/Framework_Component_T.h
+++ b/ace/Framework_Component_T.h
@@ -12,6 +12,7 @@
 #ifndef ACE_FRAMEWORK_COMPONENT_T_H
 #define ACE_FRAMEWORK_COMPONENT_T_H
 #include "ace/pre.h"
+#include "ace/Framework_Component.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp
index c1c71e1711a..be5088ccb2b 100644
--- a/ace/ace_dll.dsp
+++ b/ace/ace_dll.dsp
@@ -366,6 +366,10 @@ SOURCE=.\Flag_Manip.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Framework_Component.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Functor.cpp

 # End Source File

 # Begin Source File

@@ -1354,6 +1358,10 @@ SOURCE=.\Flag_Manip.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Framework_Component.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Free_List.h

 # End Source File

 # Begin Source File

@@ -2458,6 +2466,10 @@ SOURCE=.\Flag_Manip.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Framework_Component.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Free_List.i

 # End Source File

 # Begin Source File

@@ -3147,6 +3159,10 @@ SOURCE=.\Dump_T.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Framework_Component_T.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Free_List.cpp

 # PROP Exclude_From_Build 1

 # End Source File

diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp
index 08b99396a42..6b378b52099 100644
--- a/ace/ace_lib.dsp
+++ b/ace/ace_lib.dsp
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Release"

 # PROP Target_Dir ""

-LINK32=link.exe -lib

 MTL=midl.exe

+LINK32=link.exe -lib

 # ADD BASE CPP /nologo /MD /W3 /GX /O1 /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MT /W3 /GX /O1 /I "../" /I "../PACE" /D ACE_OS_HAS_DLL=0 /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

@@ -69,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Debug"

 # PROP Target_Dir ""

-LINK32=link.exe -lib

 MTL=midl.exe

+LINK32=link.exe -lib

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /Gy /I "../" /I "../PACE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c

@@ -96,8 +96,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Release"

 # PROP Target_Dir ""

-LINK32=link.exe -lib

 MTL=midl.exe

+LINK32=link.exe -lib

 # ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /Zi /O1 /I "../" /I "../PACE" /D "_WINDOWS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

@@ -122,8 +122,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Debug"

 # PROP Target_Dir ""

-LINK32=link.exe -lib

 MTL=midl.exe

+LINK32=link.exe -lib

 # ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /I "../PACE" /D "_WINDOWS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

@@ -357,6 +357,10 @@ SOURCE=.\Flag_Manip.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Framework_Component.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Functor.cpp

 # End Source File

 # Begin Source File

@@ -1345,6 +1349,10 @@ SOURCE=.\Flag_Manip.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Framework_Component.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Free_List.h

 # End Source File

 # Begin Source File

@@ -2457,6 +2465,10 @@ SOURCE=.\Flag_Manip.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Framework_Component.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Free_List.i

 # End Source File

 # Begin Source File

@@ -3142,6 +3154,10 @@ SOURCE=.\Dump_T.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Framework_Component_T.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Free_List.cpp

 # PROP Exclude_From_Build 1

 # End Source File