summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-05-01 16:25:53 +0000
committerjai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-05-01 16:25:53 +0000
commit0d0d4b5845ff29a4b758d834f333a064bb14fcde (patch)
treefdf8e1988a8d335ef6b1b90e1b433dc9b831def7
parent903f1182593ba2b64c8126fea248618d27d02c92 (diff)
downloadATCD-0d0d4b5845ff29a4b758d834f333a064bb14fcde.tar.gz
mods
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Algorithms.cpp1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Combination_T.h2
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Basic.h3
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.cpp1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.h1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Packing.cpp1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Primary.cpp1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.cpp1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.h1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Worstfit.cpp1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FailureAwareWCRT.cpp1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/OptimizedWCRT.cpp1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/OptimizedWCRT.h1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/RankedWCRT.h1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Simple_Ranking.cpp1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Utilization_Ranking.cpp1
16 files changed, 19 insertions, 0 deletions
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Algorithms.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Algorithms.cpp
index e34330489d5..a2bdcb5714b 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Algorithms.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Algorithms.cpp
@@ -12,6 +12,7 @@
#include <iostream>
#include <sstream>
+#include <stdlib.h>
#include "Algorithms.h"
unsigned int extract_rank (const Taskname & taskname)
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Combination_T.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Combination_T.h
index 7f723a0efb9..49bca23f622 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Combination_T.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Combination_T.h
@@ -16,6 +16,8 @@
#ifndef COMBINATION_T_H_
#define COMBINATION_T_H_
+#include <algorithm>
+
template <class ITERATOR>
inline bool
next_combination (ITERATOR base_begin,
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Basic.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Basic.h
index 82e2a199cbc..4fb8a7747f7 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Basic.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Basic.h
@@ -14,6 +14,9 @@
#define FTRMFF_BASIC_ALGORITHM_H_
#include "Schedule.h"
+#include <stdlib.h>
+#include <algorithm>
+#include <memory>
typedef std::auto_ptr <CTT_Algorithm> CTT_PTR;
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.cpp
index 1fc53e5602b..d8f13adafca 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.cpp
@@ -14,6 +14,7 @@
#include "FTRMFF_Enhanced.h"
#include "Multi_Failure_Scheduler.h"
#include "Simple_Ranking.h"
+#include <algorithm>
FTRMFF_Enhanced::~FTRMFF_Enhanced ()
{
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.h
index 2c3a38ac851..536fc95e001 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.h
@@ -14,6 +14,7 @@
#define FTRMFF_ENHANCED_ALGORITHM_H_
#include "Schedule.h"
+#include <memory>
class FTRMFF_Enhanced : public FTRMFF_Algorithm
{
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Packing.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Packing.cpp
index 735791c37b5..018a011308a 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Packing.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Packing.cpp
@@ -14,6 +14,7 @@
#include "CTT_Enhanced.h"
#include "FTRMFF_Packing.h"
#include "FTRMFF_Primary.h"
+#include <algorithm>
FTRMFF_Packing::~FTRMFF_Packing ()
{
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Primary.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Primary.cpp
index 5a84604bd45..78687088621 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Primary.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Primary.cpp
@@ -12,6 +12,7 @@
#include <sstream>
#include "FTRMFF_Primary.h"
+#include <algorithm>
FTRMFF_Primary::~FTRMFF_Primary ()
{
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.cpp
index 4d9b6846876..2712c40ef4e 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.cpp
@@ -15,6 +15,7 @@
#include "Ranked_Scheduler.h"
#include "Simple_Ranking.h"
#include "Utilization_Ranking.h"
+#include <algorithm>
FTRMFF_Ranked::~FTRMFF_Ranked ()
{
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.h
index db67f2d9c82..a4d1ef56e0f 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.h
@@ -14,6 +14,7 @@
#define FTRMFF_RANKED_ALGORITHM_H_
#include "Schedule.h"
+#include <memory>
class FTRMFF_Ranked : public FTRMFF_Algorithm
{
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Worstfit.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Worstfit.cpp
index db4d5d2b0ba..af6ec7e8e64 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Worstfit.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Worstfit.cpp
@@ -13,6 +13,7 @@
#include "FTRMFF_Worstfit.h"
#include "RankedWCRT.h"
#include "Utilization_Ranking.h"
+#include <algorithm>
FTRMFF_Worstfit::~FTRMFF_Worstfit ()
{
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FailureAwareWCRT.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FailureAwareWCRT.cpp
index 3fb726ee674..bab8b682854 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FailureAwareWCRT.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FailureAwareWCRT.cpp
@@ -11,6 +11,7 @@
//=============================================================================
#include "FailureAwareWCRT.h"
+#include <algorithm>
FailureAwareWCRT::FailureAwareWCRT (const TASK_LIST & tasks,
const REPLICA_GROUPS & rep_groups)
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/OptimizedWCRT.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/OptimizedWCRT.cpp
index baa7527f0ef..afd11f171dc 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/OptimizedWCRT.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/OptimizedWCRT.cpp
@@ -12,6 +12,7 @@
#include "OptimizedWCRT.h"
#include "CTT_Enhanced.h"
+#include <algorithm>
/**
* @struct TaskRoleModifier
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/OptimizedWCRT.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/OptimizedWCRT.h
index f668009c87a..56f60e2fdd5 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/OptimizedWCRT.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/OptimizedWCRT.h
@@ -14,6 +14,7 @@
#define OPTIMIZED_WCRT_H_
#include "Schedule.h"
+#include <memory>
struct OptimizedWCRT : public std::binary_function <double,
TASKNAME_SET,
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/RankedWCRT.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/RankedWCRT.h
index b8690985a89..1fd6ec99c1d 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/RankedWCRT.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/RankedWCRT.h
@@ -14,6 +14,7 @@
#define RANKED_WCRT_H_
#include "Schedule.h"
+#include <memory>
/// this map associates a task with all the possible combinations of
/// processor failures for which it becomes active
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Simple_Ranking.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Simple_Ranking.cpp
index 54debb04575..8cc955baf6a 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Simple_Ranking.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Simple_Ranking.cpp
@@ -12,6 +12,7 @@
#include <sstream>
#include "Simple_Ranking.h"
+#include <algorithm>
Simple_Ranking::~Simple_Ranking ()
{
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Utilization_Ranking.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Utilization_Ranking.cpp
index 9d273889525..85489e2b27a 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Utilization_Ranking.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Utilization_Ranking.cpp
@@ -12,6 +12,7 @@
#include <sstream>
#include "Utilization_Ranking.h"
+#include <algorithm>
class WCRTOrdering : std::binary_function <ScheduleResult,
ScheduleResult,