diff options
| author | Yunlian Jiang <yunlian@google.com> | 2013-04-05 14:41:56 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-04-09 12:13:16 -0700 |
| commit | a178e5e6efc0849e286b9275d3b052ada6b1a43f (patch) | |
| tree | f62654a00be9fa101cadee850136bc7fd0dc9232 /action_processor_unittest.cc | |
| parent | 7f2ec75d94ede532d487999a30357d8682581496 (diff) | |
Fix the confict of declaration and definition between struct and class
This fixes the error when compiling with clang syntax checking
The error message was:
/update_engine/test_utils.h:188:1: error: 'ObjectFeederAction'
defined as a struct template here but previously declared as a
class template [-Werror,-Wmismatched-tags]
BUG=chromium:218781
TEST=USE="chrome_internal" CXXFLAGS="-clang -print-cmdline"
CFLAGS="-clang -print-cmdline" emerge-x86-alex update_engine
Change-Id: Ieac9981c84c4e5779cbf876650f21a5d1b2acd72
Reviewed-on: https://gerrit.chromium.org/gerrit/47476
Reviewed-by: Jay Srinivasan <jaysri@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
Commit-Queue: Yunlian Jiang <yunlian@chromium.org>
Diffstat (limited to 'action_processor_unittest.cc')
| -rw-r--r-- | action_processor_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/action_processor_unittest.cc b/action_processor_unittest.cc index 7f391497..20a79af7 100644 --- a/action_processor_unittest.cc +++ b/action_processor_unittest.cc @@ -23,7 +23,8 @@ class ActionTraits<ActionProcessorTestAction> { }; // This is a simple Action class for testing. -struct ActionProcessorTestAction : public Action<ActionProcessorTestAction> { +class ActionProcessorTestAction : public Action<ActionProcessorTestAction> { + public: typedef string InputObjectType; typedef string OutputObjectType; ActionPipe<string>* in_pipe() { return in_pipe_.get(); } |