25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
diff -up libdap-3.16.0/dds.yy.gcc6 libdap-3.16.0/dds.yy
|
|
--- libdap-3.16.0/dds.yy.gcc6 2015-10-19 16:03:35.000000000 -0600
|
|
+++ libdap-3.16.0/dds.yy 2016-02-04 13:59:22.309817685 -0700
|
|
@@ -262,7 +262,7 @@ declaration: base_type var ';'
|
|
| grid '{' SCAN_WORD ':'
|
|
{
|
|
if (is_keyword(string($3), "array")) {
|
|
- part = array;
|
|
+ part = libdap::array;
|
|
}
|
|
else {
|
|
ostringstream msg;
|
|
diff -up libdap-3.16.0/unit-tests/generalUtilTest.cc.gcc6 libdap-3.16.0/unit-tests/generalUtilTest.cc
|
|
--- libdap-3.16.0/unit-tests/generalUtilTest.cc.gcc6 2015-09-08 16:42:20.000000000 -0600
|
|
+++ libdap-3.16.0/unit-tests/generalUtilTest.cc 2016-02-04 14:12:59.677136555 -0700
|
|
@@ -265,7 +265,7 @@ CPPUNIT_TEST_SUITE(generalUtilTest);
|
|
DBG(cerr << "XXX" << unescattr("\\\"attr") << "XXX" << endl);
|
|
CPPUNIT_ASSERT(unescattr("\\\"attr") == "\"attr");
|
|
|
|
- char A_200_177[4] = { 128, 127, 'A', '\0' };
|
|
+ char A_200_177[4] = { (char)128, 127, 'A', '\0' };
|
|
DBG(cerr << "XXX" << unescattr("\\200\\177A") << "XXX" << endl);
|
|
CPPUNIT_ASSERT(unescattr("\\200\\177A") == string(A_200_177));
|
|
|