Skip to content

Remove c++11 dependency #761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnhaley81 merged 1 commit into from
Oct 21, 2015
Merged

Remove c++11 dependency #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions generate/templates/manual/include/functions/sleep_for_ms.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef SLEEP_FOR_MS_H
#define SLEEP_FOR_MS_H

void sleep_for_ms(int milliseconds);

#endif
16 changes: 16 additions & 0 deletions generate/templates/manual/src/functions/sleep_for_ms.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#ifdef WIN32
#include <windows.h>
#else
#include <time.h>
#endif // win32

void sleep_for_ms(int milliseconds) {
#ifdef WIN32
Sleep(milliseconds);
#else
struct timespec t;
t.tv_sec = 0;
t.tv_nsec = milliseconds * 1000000; // 1 milliseconds == 1,000,000 nanoseconds
nanosleep(&t, NULL);
#endif
}
2 changes: 1 addition & 1 deletion generate/templates/partials/callback_helpers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
uv_async_send(&baton->req);

while(!baton->done) {
this_thread::sleep_for(chrono::milliseconds(1));
sleep_for_ms(1);
}

{% each cbFunction|returnsInfo false true as _return %}
Expand Down
2 changes: 1 addition & 1 deletion generate/templates/partials/field_accessors.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
uv_async_send(&baton->req);

while(!baton->done) {
this_thread::sleep_for(chrono::milliseconds(1));
sleep_for_ms(1);
}

{% each field|returnsInfo false true as _return %}
Expand Down
4 changes: 2 additions & 2 deletions generate/templates/templates/binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"src/nodegit.cc",
"src/wrapper.cc",
"src/functions/copy.cc",
"src/functions/sleep_for_ms.cc",
"src/str_array_converter.cc",
{% each %}
{% if type != "enum" %}
Expand All @@ -31,8 +32,7 @@
],

"cflags": [
"-Wall",
"-std=c++11"
"-Wall"
],

"conditions": [
Expand Down
3 changes: 1 addition & 2 deletions generate/templates/templates/class_content.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// This is a generated file, modify: generate/templates/class_content.cc.
#include <nan.h>
#include <string.h>
#include <chrono>
#include <thread>

extern "C" {
#include <git2.h>
Expand All @@ -13,6 +11,7 @@ extern "C" {

#include "../include/functions/copy.h"
#include "../include/{{ filename }}.h"
#include "../include/functions/sleep_for_ms.h"

{% each dependencies as dependency %}
#include "{{ dependency }}"
Expand Down
8 changes: 6 additions & 2 deletions generate/templates/templates/struct_content.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
// This is a generated file, modify: generate/templates/struct_content.cc.
#include <nan.h>
#include <string.h>
#include <chrono>
#include <thread>
#ifdef WIN32
#include <windows.h>
#else
#include <unistd.h>
#endif // win32

extern "C" {
#include <git2.h>
Expand All @@ -14,6 +17,7 @@ extern "C" {
#include <iostream>
#include "../include/functions/copy.h"
#include "../include/{{ filename }}.h"
#include "../include/functions/sleep_for_ms.h"

{% each dependencies as dependency %}
#include "{{ dependency }}"
Expand Down