summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/ChangeLog19
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h4
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc1
-rw-r--r--TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc1
-rw-r--r--TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp2
-rw-r--r--TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp7
-rw-r--r--TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h2
-rw-r--r--TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc1
-rw-r--r--TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h3
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h4
-rw-r--r--TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_App.mpc6
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_Creator.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_Creator.h5
16 files changed, 50 insertions, 15 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ae392cd7d53..70031aaf189 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,22 @@
+Mon Dec 22 12:05:26 2003 Dale Wilson <wilson_d@ociweb.com>
+
+ * orbsvcs/FT_ReplicationManager/FT_Property_Validator.h:
+ * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
+ * orbsvcs/Fault_Detector/Fault_Detector.mpc:
+ * orbsvcs/Fault_Detector/Fault_Detector_Main.cpp:
+ * orbsvcs/Fault_Notifier/FT_Notifier_i.h:
+ * orbsvcs/Fault_Notifier/FT_Notifier_i.cpp:
+ * orbsvcs/Fault_Notifier/Fault_Notifier.mpc:
+ * orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h:
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h:
+ * orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp:
+ * orbsvcs/tests/FT_App/FT_App.mpc:
+ * orbsvcs/tests/FT_App/FT_Creator.h:
+ * orbsvcs/tests/FT_App/FT_Creator.cpp:
+ Fix cosmetic problems reported by fuzz build.
+
Mon Dec 22 17:43:12 UTC 2003 Don Hinton <dhinton@dresystems.com>
* tao/Any_Dual_Impl_T.{h,cpp}:
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
index bfd26227174..cc5912f9b36 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
@@ -2,7 +2,7 @@
//=============================================================================
/**
- * @file FT__Property_Validator.h
+ * @file FT_Property_Validator.h
*
* $Id$
*
@@ -88,6 +88,6 @@ namespace TAO
} // namespace TAO
-#include "ace/post.h"
+#include /**/ "ace/post.h"
#endif /* FT_PROPERTY_VALIDATOR_H */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
index c49e50d2b92..c8b0643d09c 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
@@ -1,3 +1,4 @@
+// $Id$
project(*Lib): orbsvcslib, core, notification, fault_tolerance, ftorb, portablegroup {
sharedname = TAO_ReplicationManagerLib
dynamicflags = TAO_REPLICATIONMANAGERLIB_BUILD_DLL
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc b/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
index 089f92cad95..c8395db75b8 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector.mpc
@@ -1,3 +1,4 @@
+// $Id$
project : taoserver, orbsvcsexe, fault_tolerance {
exename = Fault_Detector
Source_Files {
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp
index a9bb89197d9..e8585c9764a 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
//=============================================================================
/**
- * @file FaultDetectorMain.cpp
+ * @file Fault_Detector_Main.cpp
*
* $Id$
*
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
index f561ca45bc9..0678165a56f 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
@@ -1,7 +1,7 @@
// -*- C++ -*-
//=============================================================================
/**
- * @file FT_FaultNotifier_i.cpp
+ * @file FT_Notifier_i.cpp
*
* $Id$
*
@@ -13,7 +13,10 @@
#include "FT_Notifier_i.h"
-#include "ace/Get_Opt.h"
+#include <ace/Get_Opt.h>
+#include <ace/OS_NS_stdio.h>
+#include <tao/debug.h>
+
// Use this macro at the beginning of CORBA methods
// to aid in debugging.
#define METHOD_ENTRY(name) \
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index 4c11a315af7..ab820df236c 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -3,7 +3,7 @@
// $Id$
//=============================================================================
/**
- * @file Fault_Notifier_i.h
+ * @file FT_Notifier_i.h
*
* $Id$
*
diff --git a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
index 750159d37ab..5f079ce6c8a 100644
--- a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
+++ b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier.mpc
@@ -1,3 +1,4 @@
+// $Id$
project : taoserver, orbsvcsexe, fault_tolerance, notification {
exename = Fault_Notifier
Source_Files {
diff --git a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp
index 3158b4bb20a..52cbdd95954 100644
--- a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp
+++ b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
//=============================================================================
/**
- * @file FaultNotifierMain.cpp
+ * @file Fault_Notifier_Main.cpp
*
* $Id$
*
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
index 68264080acd..d7ae38d5150 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
@@ -20,6 +20,7 @@
#define TAO_PG_PROPERTY_SET
#include "portablegroup_export.h"
#include <orbsvcs/PortableGroupS.h>
+#include /**/ "ace/pre.h"
#include <orbsvcs/CosNamingC.h>
#include <ace/Hash_Map_Manager.h>
#include <ace/SString.h>
@@ -184,4 +185,6 @@ namespace TAO
// include templated helper function
#include "PG_Property_Set_Find.h"
+#include /**/ "ace/post.h"
+
#endif // TAO_PG_PROPERTY_SET
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
index 8afe09346a2..b06794df571 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
//=============================================================================
/**
- * @file PG_Property_Set.h
+ * @file PG_Property_Set_Find.h
*
* $Id$
*
@@ -45,4 +45,6 @@ namespace TAO
} //namespace TAO
+#include /**/ "ace/post.h"
+
#endif // TAO_PG_PROPERTY_SET_FIND_H
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
index 2678c92d575..0026d265d16 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
@@ -12,7 +12,7 @@
#ifndef TAO_UIPMC_TRANSPORT_H
#define TAO_UIPMC_TRANSPORT_H
-#include "ace/pre.h"
+#include /**/ "ace/pre.h"
#include "tao/Transport.h"
@@ -128,5 +128,5 @@ private:
#include "UIPMC_Transport.i"
#endif /* __ACE_INLINE__ */
-#include "ace/post.h"
+#include /**/ "ace/post.h"
#endif /* TAO_UIPMC_TRANSPORT_H */
diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp
index 8236a0465d0..01f79422633 100644
--- a/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
//=============================================================================
/**
- * @file FTApp_FaultConsumer_Main.cpp
+ * @file FTAPP_FaultConsumer_Main.cpp
*
* $Id$
*
diff --git a/TAO/orbsvcs/tests/FT_App/FT_App.mpc b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
index 0b91e76f89f..1e849ce33d7 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_App.mpc
+++ b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
@@ -1,3 +1,5 @@
+// $Id$
+
project(*Server): taoserver, fault_tolerance, orbsvcsexe{
exename = ft_replica
Source_Files {
@@ -27,7 +29,7 @@ project(*Server): taoserver, fault_tolerance, orbsvcsexe{
run_test_fault_consumer.pl // Is the notification analyzed correctly
run_test_registry.pl // does the stand-along factory registry work
run_test_rmregistry.pl // does the factory registry in the RM work
- run_test_replication_mgr.pl //
+ run_test_replication_mgr.pl //
run_test_demo.pl // test it all together
}
}
@@ -97,7 +99,7 @@ project(*FactoryRegistry): taoclient, fault_tolerance, orbsvcsexe {
}
Header_Files {
-
+
}
// explicitly omit IDL files
IDL_Files {
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index f8f39abca76..95ce602f883 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
//=============================================================================
/**
- * @file TAO_Object_Group_Creator.cpp
+ * @file FT_Creator.cpp
*
* $Id$
*
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
index c0ca6d8d2be..5d6c26321a5 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
//=============================================================================
/**
- * @file TAO_FT_Creator.h
+ * @file FT_Creator.h
*
* $Id$
*
@@ -15,6 +15,7 @@
#ifndef FT_CREATOR_H
#define FT_CREATOR_H
#include <ace/ACE.h>
+#include /**/ "ace/pre.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
@@ -108,4 +109,6 @@ namespace FTAPP
} // namespace TAO
+#include /**/ "ace/post.h"
+
#endif // FT_CREATOR_H
View Lorry Controller Status