Merge remote-tracking branch 'upstream/master'

1 files changed, 8 insertions, 5 deletions

diff --git a/decoder/decoder.h b/decoder/decoder.h
index 79c7a602..8039a42b 100644
--- a/decoder/decoder.h
+++ b/decoder/decoder.h
@@ -25,9 +25,10 @@ private:
 
 class SentenceMetadata;
 class Hypergraph;
-struct DecoderImpl;
+class DecoderImpl;
 
-struct DecoderObserver {
+class DecoderObserver {
+ public:
   virtual ~DecoderObserver();
   virtual void NotifyDecodingStart(const SentenceMetadata& smeta);
   virtual void NotifySourceParseFailure(const SentenceMetadata& smeta);
@@ -37,9 +38,10 @@ struct DecoderObserver {
   virtual void NotifyDecodingComplete(const SentenceMetadata& smeta);
 };
 
-struct Grammar;  // TODO once the decoder interface is cleaned up,
-                 // this should be somewhere else
-struct Decoder {
+class Grammar;  // TODO once the decoder interface is cleaned up,
+                // this should be somewhere else
+class Decoder {
+ public:
   Decoder(int argc, char** argv);
   Decoder(std::istream* config_file);
   bool Decode(const std::string& input, DecoderObserver* observer = NULL);
@@ -49,6 +51,7 @@ struct Decoder {
   std::vector<weight_t>& CurrentWeightVector();
   const std::vector<weight_t>& CurrentWeightVector() const;
 
+  // this sets the current sentence ID
   void SetId(int id);
   ~Decoder();
   const boost::program_options::variables_map& GetConf() const { return conf; }