CDPP / AMDA_Kernel

Commit 46ca92d00ae60527e6bdf8d3628280a90882dbd8

Authored by Elena.Budnik
1 parent 91acc36e
Exists in master and in 94 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, amdadev, amdadev_test, cu2022, das2, density_maps, develop, evol-5638, evol-6371, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_5639, rm_5776, rm_6015, rm_6595, rm_6599, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, sum-components-indexes, test-merge, tickplot, ubuntu

add / move headers (from branch SolarOrbiter)

Showing 10 changed files with 15 additions and 7 deletions   Show diff stats
Inline Side-by-side
src/Common/ParameterIndexesTool.hh
  Diff comments   View file @46ca92d
... ... @@ -10,6 +10,7 @@
10 10  
11 11 #include <boost/algorithm/string.hpp>
12 12 #include <boost/lexical_cast.hpp>
  13 +#include <vector>
13 14  
14 15 namespace AMDA {
15 16 namespace Common {
... ...
src/Info/DataSetInfo.cc
  Diff comments   View file @46ca92d
... ... @@ -6,6 +6,7 @@
6 6 */
7 7  
8 8 #include "DataSetInfo.hh"
  9 +#define PUSHINFO(infoMap, key, value) if(!value.empty())infoMap.push_back(std::pair<std::string,std::string>(key,value))
9 10  
10 11 namespace AMDA {
11 12 namespace Info {
... ... @@ -29,8 +30,6 @@ std::ostream&amp; operator&lt;&lt;(std::ostream&amp; out, const DataSetInfo&amp; dsi){
29 30 return out;
30 31 }
31 32  
32   -#define PUSHINFO(infoMap, key, value) if(!value.empty())infoMap.push_back(std::pair<std::string,std::string>(key,value))
33   -
34 33 std::vector<std::pair<std::string,std::string>> DataSetInfo::getInfoMap()
35 34 {
36 35 std::vector<std::pair<std::string,std::string>> infoMap;
... ...
src/Info/DataSetInfo.hh
  Diff comments   View file @46ca92d
... ... @@ -13,6 +13,8 @@
13 13 #include <map>
14 14 #include <algorithm>
15 15 #include <boost/shared_ptr.hpp>
  16 +#include <utility>
  17 +#include <vector>
16 18  
17 19 namespace AMDA {
18 20 namespace Info {
... ...
src/Info/InstrumentInfo.hh
  Diff comments   View file @46ca92d
... ... @@ -8,6 +8,8 @@
8 8 #include <iostream>
9 9 #include <map>
10 10 #include <boost/shared_ptr.hpp>
  11 +#include <vector>
  12 +#include <utility>
11 13  
12 14 #ifndef INSTRUMENTINFO_HH_
13 15 #define INSTRUMENTINFO_HH_
... ...
src/Info/MissionInfo.hh
  Diff comments   View file @46ca92d
... ... @@ -11,6 +11,8 @@
11 11 #include <iostream>
12 12 #include <map>
13 13 #include <boost/shared_ptr.hpp>
  14 +#include <vector>
  15 +#include <utility>
14 16  
15 17 namespace AMDA {
16 18 namespace Info {
... ...
src/ParamOutputImpl/Plot/ColorSeriesProperties.hh
  Diff comments   View file @46ca92d
... ... @@ -11,6 +11,8 @@
11 11 #include <string>
12 12 #include <map>
13 13 #include <algorithm>
  14 +#include <cmath>
  15 +#include <ctgmath>
14 16  
15 17 namespace plot {
16 18  
... ...
src/ParamOutputImpl/Plot/DigitalAxis.cc
  Diff comments   View file @46ca92d
... ... @@ -169,7 +169,7 @@ double* DigitalAxis::getComputedValues(double* originalValues_, int size_, doubl
169 169 memcpy (computedValues, originalValues_, size_ * sizeof (double));
170 170  
171 171 // Need to filter min max values ?
172   - if ((isnan(min) == false) || (isnan(max) == false)) {
  172 + if ((std::isnan(min) == false) || (std::isnan(max) == false)) {
173 173 for (int i = 0; i < size_; ++i) {
174 174 if ((originalValues_[i] < min) || (originalValues_[i] > max)) {
175 175 computedValues [i] = nan("");
... ...
src/ParamOutputImpl/Plot/DigitalAxis.hh
  Diff comments   View file @46ca92d
... ... @@ -8,6 +8,8 @@
8 8 #ifndef DIGITALAXIS_HH_
9 9 #define DIGITALAXIS_HH_
10 10  
  11 +#include <cmath>
  12 +#include <ctgmath>
11 13 #include "Axis.hh"
12 14  
13 15 namespace plot {
... ...
src/ParamOutputImpl/Plot/PanelPlotOutput.cc
  Diff comments   View file @46ca92d
... ... @@ -17,6 +17,7 @@
17 17 #include "DecoratorPlot.hh"
18 18 #include "PlPlotUtil.hh"
19 19  
  20 +#include <string>
20 21 #include <boost/range/adaptor/reversed.hpp>
21 22  
22 23 using namespace AMDA::Parameters;
... ...
src/Parameters/Demangle.cc
  Diff comments   View file @46ca92d
... ... @@ -4,7 +4,7 @@
4 4 * Created on: Nov 16, 2012
5 5 * Author: f.casimir
6 6 */
7   -
  7 +#include <cxxabi.h>
8 8 #include "Demangle.hh"
9 9  
10 10 namespace AMDA {
... ... @@ -15,9 +15,6 @@ namespace Helpers {
15 15 // Here's that problem fixed, but the code is still non-re-entrant and not thread-safe.
16 16 // Anyone care to improve it?
17 17  
18   -#include <cxxabi.h>
19   -
20   -
21 18 const char* Demangle(const char* name)
22 19 {
23 20 static char buf[1024];
... ...