Ignore:
Timestamp:
10/04/16 12:42:11 (8 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes/No

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Do not use C++11 feature.

Location:
trunk/external-alma/atnf/PKSIO
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/external-alma/atnf/PKSIO/NROFITSDataset.cc

    r3104 r3105  
    849849  string str24( 24, ' ' ) ;
    850850
    851   for (unsigned int i = 0u; i < 4u; ++i) {
    852     record_->LSFIL[i] = ' ';
     851  for (unsigned int ii = 0u; ii < 4u; ++ii) {
     852    record_->LSFIL[ii] = ' ';
    853853  }
    854854  status = readTable( record_->LSFIL, "LSFIL", 4, i ) ;
     
    880880  //cout << "LAVST(" << i << ") = " << record_->LAVST << endl ;
    881881  //
    882   for (unsigned int i = 0u; i < 8u; ++i) {
    883     record_->SCANTP[i] = ' ';
     882  for (unsigned int ii = 0u; ii < 8u; ++ii) {
     883    record_->SCANTP[ii] = ' ';
    884884  }
    885885    status = readTable( record_->SCANTP, "SCNTP", strlen(record_->SCANTP), i ) ;
     
    997997  //cout << "YY(" << i << ") = " << record_->YY << endl ;
    998998  //
    999   for (unsigned int i = 0u; i < 4u; ++i) {
    1000     record_->ARRYT[i] = ' ';
     999  for (unsigned int ii = 0u; ii < 4u; ++ii) {
     1000    record_->ARRYT[ii] = ' ';
    10011001  }
    10021002  status = readTable( record_->ARRYT, "ARRYT", 4, i ) ;
  • trunk/external-alma/atnf/PKSIO/NROReader.cc

    r3097 r3105  
    5454#include <string>
    5555#include <iomanip>
     56#include <cassert>
    5657
    5758using namespace std ;
     
    6061// to limit template argument to specified type
    6162template<class T>
    62 constexpr inline bool type_guard() {
     63inline bool type_guard() {
    6364  return false;
    6465}
    6566template<>
    66 constexpr inline bool type_guard<string>() {
     67inline bool type_guard<string>() {
    6768  return true;
    6869}
    6970template<>
    70 constexpr inline bool type_guard<String>() {
     71inline bool type_guard<String>() {
    7172  return true;
    7273}
     
    7576template<class T>
    7677inline String trim_nro_string(T const &s) {
    77   static_assert(type_guard<T>(), "");
     78  assert(type_guard<T>());
    7879  return s.substr(0, s.find_first_of('\0'));
    7980}
Note: See TracChangeset for help on using the changeset viewer.