Changeset 3105 for trunk/external-alma

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:

• NROFITSDataset.cc (modified) (3 diffs)
• NROReader.cc (modified) (3 diffs)

trunk/external-alma/atnf/PKSIO/NROFITSDataset.cc

@@ -849 +849 @@
   string str24( 24, ' ' ) ;
 
-  for (unsigned int i = 0u; i < 4u; ++i) {
-    record_->LSFIL[i] = ' ';
+  for (unsigned int ii = 0u; ii < 4u; ++ii) {
+    record_->LSFIL[ii] = ' ';
   }
   status = readTable( record_->LSFIL, "LSFIL", 4, i ) ;
@@ -880 +880 @@
   //cout << "LAVST(" << i << ") = " << record_->LAVST << endl ;
   //
-  for (unsigned int i = 0u; i < 8u; ++i) {
-    record_->SCANTP[i] = ' ';
+  for (unsigned int ii = 0u; ii < 8u; ++ii) {
+    record_->SCANTP[ii] = ' ';
   }
     status = readTable( record_->SCANTP, "SCNTP", strlen(record_->SCANTP), i ) ;
@@ -997 +997 @@
   //cout << "YY(" << i << ") = " << record_->YY << endl ;
   //
-  for (unsigned int i = 0u; i < 4u; ++i) {
-    record_->ARRYT[i] = ' ';
+  for (unsigned int ii = 0u; ii < 4u; ++ii) {
+    record_->ARRYT[ii] = ' ';
   }
   status = readTable( record_->ARRYT, "ARRYT", 4, i ) ;

trunk/external-alma/atnf/PKSIO/NROReader.cc

@@ -54 +54 @@
 #include <string>
 #include <iomanip>
+#include <cassert>
 
 using namespace std ;
@@ -60 +61 @@
 // to limit template argument to specified type
 template<class T>
-constexpr inline bool type_guard() {
+inline bool type_guard() {
   return false;
 }
 template<>
-constexpr inline bool type_guard<string>() {
+inline bool type_guard<string>() {
   return true;
 }
 template<>
-constexpr inline bool type_guard<String>() {
+inline bool type_guard<String>() {
   return true;
 }
@@ -75 +76 @@
 template<class T>
 inline String trim_nro_string(T const &s) {
-  static_assert(type_guard<T>(), "");
+  assert(type_guard<T>());
   return s.substr(0, s.find_first_of('\0'));
 }