[trafficserver] branch master updated: YAML: Move ts_meta to external C++ library.

[am...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

amc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 2029028  YAML: Move ts_meta to external C++ library.
2029028 is described below

commit 20290286289f45da7eacc0d432c1906dddbc0528
Author: Alan M. Carroll <am...@apache.org>
AuthorDate: Mon Aug 20 11:14:26 2018 -0500

    YAML: Move ts_meta to external C++ library.
---
 include/{tscore => tscpp/util}/ts_meta.h              | 2 +-
 src/tscore/Makefile.am                                | 1 -
 src/tscpp/util/Makefile.am                            | 3 ++-
 src/{tscore => tscpp/util}/unit_tests/test_ts_meta.cc | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/tscore/ts_meta.h b/include/tscpp/util/ts_meta.h
similarity index 97%
rename from include/tscore/ts_meta.h
rename to include/tscpp/util/ts_meta.h
index a79c8f3..116650f 100644
--- a/include/tscore/ts_meta.h
+++ b/include/tscpp/util/ts_meta.h
@@ -36,7 +36,7 @@ namespace meta
    * the expression for validity. E.g.
    *
    * @code
-   * template <typename T> auto func(T && t, CaseArg_0 const&) -> decltype(t.item, int()) { }
+   * template <typename T> auto func(T && t, CaseTag<0>) -> decltype(t.item, int()) { }
    * @endcode
    *
    * The comma operator discards the type and value of the left operand therefore the return type of
diff --git a/src/tscore/Makefile.am b/src/tscore/Makefile.am
index 60b37ac..2221bb7 100644
--- a/src/tscore/Makefile.am
+++ b/src/tscore/Makefile.am
@@ -273,7 +273,6 @@ test_tscore_SOURCES = \
 	unit_tests/test_Scalar.cc \
 	unit_tests/test_scoped_resource.cc \
 	unit_tests/test_ts_file.cc \
-	unit_tests/test_ts_meta.cc \
 	unit_tests/test_Vec.cc
 
 CompileParseRules_SOURCES = CompileParseRules.cc
diff --git a/src/tscpp/util/Makefile.am b/src/tscpp/util/Makefile.am
index 95c3373..d73dd18 100644
--- a/src/tscpp/util/Makefile.am
+++ b/src/tscpp/util/Makefile.am
@@ -38,7 +38,8 @@ test_tscpputil_LDADD = libtscpputil.la
 test_tscpputil_SOURCES = \
 	unit_tests/unit_test_main.cc \
 	unit_tests/test_PostScript.cc \
-	unit_tests/test_TextView.cc
+	unit_tests/test_TextView.cc \
+	unit_tests/test_ts_meta.cc
 
 clean-local:
 	rm -f ParseRulesCType ParseRulesCTypeToLower ParseRulesCTypeToUpper
diff --git a/src/tscore/unit_tests/test_ts_meta.cc b/src/tscpp/util/unit_tests/test_ts_meta.cc
similarity index 97%
rename from src/tscore/unit_tests/test_ts_meta.cc
rename to src/tscpp/util/unit_tests/test_ts_meta.cc
index 35a6d76..a469f82 100644
--- a/src/tscore/unit_tests/test_ts_meta.cc
+++ b/src/tscpp/util/unit_tests/test_ts_meta.cc
@@ -20,7 +20,8 @@
 
 #include <cstring>
 
-#include "tscore/ts_meta.h"
+#include "tscpp/util/ts_meta.h"
+#include "tscpp/util/TextView.h"
 
 #include "catch.hpp"