Changeset 19064 for trunk


Ignore:
Timestamp:
07/19/18 18:09:58 (6 years ago)
Author:
tbretz
Message:
Some minor changes to make it compatible with newer sets of headers.
Location:
trunk/FACT++/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/src/EventBuilder.cc

    r19027 r19064  
    88#include <list>
    99#include <queue>
     10#include <functional> // std::bind
    1011
    1112#include <boost/algorithm/string/join.hpp>

  • trunk/FACT++/src/FitsFile.cc

    r18053 r19064  
    295295            // double check that the data was indeed read from the disk.
    296296            // Go through the fTable instead as colName is empty (yes, it is !)
    297             const map<string,CCfits::Column*> &cMap = table->column();
     297            const auto &cMap = table->column();
    298298
    299299            //check that the existing columns are the same as the ones we want to write

  • trunk/FACT++/src/MessageDim.h

    r17230 r19064  
    11#ifndef FACT_MessageDim
    22#define FACT_MessageDim
     3
     4#include <functional> // std::function
    35
    46#include "MessageImp.h"

  • trunk/FACT++/src/StateMachineImp.h

    r16730 r19064  
    77#include <vector>
    88#include <memory>
     9#include <functional> // std::function
    910#include <condition_variable>
    1011

  • trunk/FACT++/src/WindowLog.h

    r18868 r19064  
    66#include <vector>
    77#include <fstream>
     8#include <functional> // std::bind
    89
    910#include <ncurses.h> // A_NORMAL etc
    … …  
    9596    }
    9697    WindowLog(WindowLog const& log) : std::ios(), std::streambuf(), std::ostream((std::streambuf*)&log), fWindow(log.fWindow), fIsNull(false), fEnableBacklog(true),
    97         fQueueFile(bind(&WindowLog::WriteFile, this, std::placeholders::_1))
     98        fQueueFile(std::bind(&WindowLog::WriteFile, this, std::placeholders::_1))
    9899    {
    99100        //fLogFile.rdbuf()->pubsetbuf(0,0); // Switch off buffering

  • trunk/FACT++/src/drivectrl.cc

    r19034 r19064  
     1#include <numeric> // std::accumulate
     2
    13#include <boost/regex.hpp>
    24#include <boost/algorithm/string.hpp>

  • trunk/FACT++/src/smartfact.cc

    r19015 r19064  
    99#include <sys/stat.h> //for file stats
    1010#include <sys/statvfs.h> //for file statvfs
     11
     12#include <numeric> // std::accumulate
    1113
    1214#include "Dim.h"
Note: See TracChangeset for help on using the changeset viewer.