diff options
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2013-03-04 11:30:34 +0000 |
|---|---|---|
| committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2013-03-04 11:30:34 +0000 |
| commit | 5bf56ba7027cd5f22ff52d0138893f7a585135fb (patch) | |
| tree | 19e17fc79b8873e66f211276d4dd169c480cede1 /src/include/fst/extensions/pdt/pdtscript.h | |
| parent | 3da1eb108d36da35333b2d655202791af854996b (diff) | |
| parent | 5b6dc79427b8f7eeb6a7ff68034ab8548ce670ea (diff) | |
| download | openfst-kitkat-mr1-release.tar.gz | |
Merge remote-tracking branch 'goog/ics-ub-google-tts' into jb-mr2-devandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devidea133-weekly-releaseidea133
Diffstat (limited to 'src/include/fst/extensions/pdt/pdtscript.h')
| -rw-r--r-- | src/include/fst/extensions/pdt/pdtscript.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/fst/extensions/pdt/pdtscript.h b/src/include/fst/extensions/pdt/pdtscript.h index c2a1cf4..84bb27e 100644 --- a/src/include/fst/extensions/pdt/pdtscript.h +++ b/src/include/fst/extensions/pdt/pdtscript.h @@ -48,7 +48,7 @@ typedef args::Package<const FstClass &, const FstClass &, const vector<pair<int64, int64> >&, MutableFstClass *, - const ComposeOptions &, + const PdtComposeOptions &, bool> PdtComposeArgs; template<class Arc> @@ -76,7 +76,7 @@ void PdtCompose(const FstClass & ifst1, const FstClass & ifst2, const vector<pair<int64, int64> > &parens, MutableFstClass *ofst, - const ComposeOptions &copts, + const PdtComposeOptions &copts, bool left_pdt); // PDT EXPAND |