Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
XiangpengHao committed Oct 29, 2020
1 parent 5ca288b commit 4e558ef
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
4 changes: 1 addition & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
"files.associations": {
"stdexcept": "cpp"
}

}
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ RUN mkdir build-docker && cd build-docker && cmake -DCMAKE_BUILD_TYPE=Release -D
RUN cd build-docker && make
RUN cd build-docker && ./main


10 changes: 2 additions & 8 deletions include/cpp_part.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ struct Person
}
};

const std::string &get_name(const Person &person)
{
return person.name;
}
const std::string &get_name(const Person &person);

std::unique_ptr<Person> make_person()
{
return std::make_unique<Person>();
}
std::unique_ptr<Person> make_person();
13 changes: 11 additions & 2 deletions main.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
#include <iostream>
#include "rust_part.hpp"
#include "rust_part.h"
#include <chrono>

const std::string &get_name(const Person &person)
{
return person.name;
}

std::unique_ptr<Person> make_person()
{
return std::make_unique<Person>();
}

int cpp_echo(int val)
{
return val;
Expand Down Expand Up @@ -53,6 +63,5 @@ int main()
rust_part::print_shared_thing(thing);

test_lto();

return 0;
}

0 comments on commit 4e558ef

Please sign in to comment.