Remove use of STL collection class use of the "data()" method since it isn't
part of C++'98. Most of these were "std::vector<T>::data()" and
"std::string::data()".
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@108957 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Interpreter/Args.cpp b/source/Interpreter/Args.cpp
index 4d35816..059a69a 100644
--- a/source/Interpreter/Args.cpp
+++ b/source/Interpreter/Args.cpp
@@ -1008,7 +1008,7 @@
int long_options_index = -1;
val = ::getopt_long (dummy_vec.size() - 1,
- (char *const *) dummy_vec.data(),
+ (char *const *) &dummy_vec.front(),
sstr.GetData(),
long_options,
&long_options_index);
diff --git a/source/Interpreter/Options.cpp b/source/Interpreter/Options.cpp
index 90eb66c..410efc6 100644
--- a/source/Interpreter/Options.cpp
+++ b/source/Interpreter/Options.cpp
@@ -285,7 +285,10 @@
m_getopt_table[j].val = 0;
}
- return m_getopt_table.data();
+ if (m_getopt_table.empty())
+ return NULL;
+
+ return &m_getopt_table.front();
}