summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvenkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-10-19 02:25:07 +0000
committervenkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-10-19 02:25:07 +0000
commit0748db572d8ccf81c67e065da891ee0e477a741e (patch)
tree812d8ae7625230e7edff02c334da5d28d38fb747
parent1e5e05f4e2a0b0861a2474516271fac76f1f5c1a (diff)
downloadATCD-0748db572d8ccf81c67e065da891ee0e477a741e.tar.gz
ChangeLogTag: Sat Oct 18 21:18:55 2003 Venkita Subramonian <venkita@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog11
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling.dsp8
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp2
3 files changed, 14 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3b5b5cb79f9..4a41a4be698 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,6 +1,13 @@
+Sat Oct 18 21:18:55 2003 Venkita Subramonian <venkita@cs.wustl.edu>
+
+ * orbsvcs/tests/Notify/lib/Peer_T.cpp: Fixed unused arg warning.
+ * orbsvcs/orbsvcs/RTCosScheduling.dsp: Fixed path to idl compiler
+ for MSVC release configuration.
+
Sun Oct 19 02:02:27 UTC 2003 Kevin Bryan <bryank@cs.uri.edu>
- * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp:
- Cast what ACE_Thread::self() returns to int to satisfy FreeBSD.
+
+ * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp:
+ Cast what ACE_Thread::self() returns to int to satisfy FreeBSD.
Sat Oct 18 17:02:49 2003 Venkita Subramonian <venkita@cs.wustl.edu>
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.dsp b/TAO/orbsvcs/orbsvcs/RTCosScheduling.dsp
index 5ae1a4f6329..6c2d66a2fa7 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling.dsp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling.dsp
@@ -38,8 +38,8 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\RTCosScheduling"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RTCOSSCHEDULING_EXPORTS" /YX /FD /c
@@ -65,7 +65,7 @@ LINK32=link.exe
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\RTCosScheduling"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RTCOSSCHEDULING_EXPORTS" /YX /FD /c
@@ -158,7 +158,7 @@ InputPath=.\RTCosScheduling.idl
InputName=RTCosScheduling
BuildCmds= \
- ..\..\..\Release\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling\RTCosScheduling_export.h $(InputName).idl
+ ..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling\RTCosScheduling_export.h $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 65a2ab494e8..4dbd933b6ca 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -147,7 +147,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::set_qos (
template <class Peer_Traits>
void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
{
#if (TAO_HAS_MINIMUM_CORBA == 0)
ACE_TRY