Changeset 3078 for trunk/src

Timestamp:

11/25/15 15:35:51 (9 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

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...

Make STIdxIter2 warning free. Utility function split is defined inside STIdxIter2 since it is not used outside the class. If it is useful, it will be separated from the class.

File:

• trunk/src/STIdxIter.h (modified) (2 diffs)

trunk/src/STIdxIter.h

@@ -16 +16 @@
 using namespace casa ;
 
-namespace {
-vector<string> split(const string &str, char delim)
-{
-  vector<string> result;
-  size_t current = 0;
-  size_t found;
-  while ((found = str.find_first_of(delim, current)) != string::npos) {
-    result.push_back(string(str, current, found - current));
-    current = found + 1;
-  }
-  result.push_back(string(str, current, str.size() - current));
-  return result;
-}
-} // anonymous namespace
+//namespace {
+//vector<string> split(const string &str, char delim)
+//{
+//  vector<string> result;
+//  size_t current = 0;
+//  size_t found;
+//  while ((found = str.find_first_of(delim, current)) != string::npos) {
+//    result.push_back(string(str, current, found - current));
+//    current = found + 1;
+//  }
+//  result.push_back(string(str, current, str.size() - current));
+//  return result;
+//}
+//} // anonymous namespace
 
 namespace asap {
@@ -65 +65 @@
   virtual void init();
 private:
+  static vector<string> split(const string &str, char delim)
+  {
+    vector<string> result;
+    size_t current = 0;
+    size_t found;
+    while ((found = str.find_first_of(delim, current)) != string::npos) {
+      result.push_back(string(str, current, found - current));
+      current = found + 1;
+    }
+    result.push_back(string(str, current, str.size() - current));
+    return result;
+  }
   vector<uInt> tovector(Vector<uInt> v);
   void addSortKey(const string &name);