From b5158b890d531134cc52653cf506d47aff35c8d2 Mon Sep 17 00:00:00 2001 From: "Anton A. Shtanyuk" Date: Sat, 9 Nov 2019 18:04:35 +0300 Subject: [PATCH 1/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 50b8bb1..cedf7c1 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ 1. Выполнить клонирование репозитария из своего аккаунта к себе на локальную машину. 1. Создать ветку **git** с индивидуальным номером. 1. Сделать ветку активной. -1. Поместить в **include** каталог файл **task1.h**, а в **src** - файлы **task1.cpp**, **task2.cpp**. +1. Поместить в **include** каталог файл **task1.h**, а в **src** - файлы **task1.cpp**, **main1.cpp**. 1. Добавить файлы в хранилище **git add .** 1. Выполнить фиксацию изменений **git commit -m "комментарий"** 1. Отправить содержимое ветки в свой удаленный репозитарий **git push origin имя_ветки** From 4db40271fedef668df459864826c0c6c50113ef6 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 5 Dec 2019 12:24:20 +0300 Subject: [PATCH 2/4] =?UTF-8?q?Test=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/README.md | 1 - include/task1.h | 1 + src/README.md | 1 - src/main.cpp | 12 ++++++++++++ src/task1.cpp | 7 +++++++ 5 files changed, 20 insertions(+), 2 deletions(-) delete mode 100644 include/README.md create mode 100644 include/task1.h delete mode 100644 src/README.md create mode 100644 src/main.cpp create mode 100644 src/task1.cpp diff --git a/include/README.md b/include/README.md deleted file mode 100644 index 375c152..0000000 --- a/include/README.md +++ /dev/null @@ -1 +0,0 @@ -# Здесь размещается файл **task1.h** diff --git a/include/task1.h b/include/task1.h new file mode 100644 index 0000000..d393f16 --- /dev/null +++ b/include/task1.h @@ -0,0 +1 @@ +int ageCheck(int age); \ No newline at end of file diff --git a/src/README.md b/src/README.md deleted file mode 100644 index 2607db2..0000000 --- a/src/README.md +++ /dev/null @@ -1 +0,0 @@ -# Здесь помещаются файлы **task1.cpp** и **main1.cpp** diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..0a06579 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,12 @@ +#include "task1.h" +#include "stdio.h" + +int main() +{ + int age= 0; + puts("enter your age:\n"); + scanf_s("%d", &age); + int result = ageCheck(age); + if (result == 0) printf("Access granted\n"); + else printf("Access denied\n"); +} \ No newline at end of file diff --git a/src/task1.cpp b/src/task1.cpp new file mode 100644 index 0000000..6135cee --- /dev/null +++ b/src/task1.cpp @@ -0,0 +1,7 @@ +#include "task1.h" + +int ageCheck(int age) +{ + if (age >= 18) return 0; + else return 1; +} \ No newline at end of file From 8249d97caf1cbb13e628b8319e29c47ee46e3c1f Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 5 Dec 2019 13:18:46 +0300 Subject: [PATCH 3/4] =?UTF-8?q?Test=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.cpp | 2 +- src/task1.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 0a06579..7fb2c2f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,6 +7,6 @@ int main() puts("enter your age:\n"); scanf_s("%d", &age); int result = ageCheck(age); - if (result == 0) printf("Access granted\n"); + if (result == 1) printf("Access granted\n"); else printf("Access denied\n"); } \ No newline at end of file diff --git a/src/task1.cpp b/src/task1.cpp index 6135cee..93f33c2 100644 --- a/src/task1.cpp +++ b/src/task1.cpp @@ -2,6 +2,6 @@ int ageCheck(int age) { - if (age >= 18) return 0; - else return 1; + if (age >= 18) return 1; + else return 0; } \ No newline at end of file From cb7bac1dceb8c9f49b082404ecce55d15ac9ba9a Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 5 Dec 2019 13:48:32 +0300 Subject: [PATCH 4/4] =?UTF-8?q?test=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.cpp | 12 ------------ src/main1.cpp | 16 ++++++++++++++++ src/task1.cpp | 6 ++++-- 3 files changed, 20 insertions(+), 14 deletions(-) delete mode 100644 src/main.cpp create mode 100644 src/main1.cpp diff --git a/src/main.cpp b/src/main.cpp deleted file mode 100644 index 7fb2c2f..0000000 --- a/src/main.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "task1.h" -#include "stdio.h" - -int main() -{ - int age= 0; - puts("enter your age:\n"); - scanf_s("%d", &age); - int result = ageCheck(age); - if (result == 1) printf("Access granted\n"); - else printf("Access denied\n"); -} \ No newline at end of file diff --git a/src/main1.cpp b/src/main1.cpp new file mode 100644 index 0000000..a648a4e --- /dev/null +++ b/src/main1.cpp @@ -0,0 +1,16 @@ +#define _CRT_SECURE_NO_WARNINGS +#include "task1.h" +#include "stdio.h" + +int main() +{ + int age = 0; + printf("Enter your age:\n"); + scanf("%d", &age); + int result = ageCheck(age); + if (result == 1) + printf("Access granted\n"); + else + printf("Access denied\n"); + return 0; +} \ No newline at end of file diff --git a/src/task1.cpp b/src/task1.cpp index 93f33c2..faf115d 100644 --- a/src/task1.cpp +++ b/src/task1.cpp @@ -2,6 +2,8 @@ int ageCheck(int age) { - if (age >= 18) return 1; - else return 0; + if (age >= 18) + return 1; + else + return 0; } \ No newline at end of file