Browse Source

merged with gm

master
tedjk 11 years ago
parent
commit
26dc5d44dd
  1. 2
      juci/config.h
  2. 2
      juci/terminal.cc
  3. 2
      juci/terminal.h

2
juci/config.h

@ -1,4 +1,4 @@
#ifndef #ifndef JUCI_CONFIG_H_
#define JUCI_CONFIG_H_ #define JUCI_CONFIG_H_
#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/json_parser.hpp>
#include <boost/property_tree/xml_parser.hpp> #include <boost/property_tree/xml_parser.hpp>

2
juci/terminal.cc

@ -7,7 +7,7 @@
Terminal::Config::Config() { Terminal::Config::Config() {
} }
Terminal::Config::Config(Terminal::Config& original) { Terminal::Config::Config(Terminal::Config& original) {
for (auto it = 0; original.compile_commands().size(); ++it) { for (auto it = 0; it<original.compile_commands().size(); ++it) {
InsertCompileCommand(original.compile_commands().at(it)); InsertCompileCommand(original.compile_commands().at(it));
} }
} }

2
juci/terminal.h

@ -11,7 +11,7 @@ namespace Terminal {
public: public:
Config (); Config ();
Config(Terminal::Config& original); Config(Terminal::Config& original);
std::vector<std::string>& compile_commands() {return &compile_commands_;} std::vector<std::string>& compile_commands() { return compile_commands_; }
void InsertCompileCommand(std::string command); void InsertCompileCommand(std::string command);
private: private:
std::vector<std::string> compile_commands_; std::vector<std::string> compile_commands_;

Loading…
Cancel
Save