aboutsummaryrefslogtreecommitdiff
path: root/src/libjin
diff options
context:
space:
mode:
Diffstat (limited to 'src/libjin')
-rw-r--r--src/libjin/Audio/SDL/SDLSource.h2
-rw-r--r--src/libjin/Graphics/Canvas.h2
-rw-r--r--src/libjin/Graphics/JSL.h4
-rw-r--r--src/libjin/Thread/Thread.cpp2
-rw-r--r--src/libjin/Thread/Thread.h4
-rw-r--r--src/libjin/Thread/thread.cpp2
-rw-r--r--src/libjin/Thread/thread.h4
-rw-r--r--src/libjin/thread/thread.cpp2
-rw-r--r--src/libjin/thread/thread.h4
9 files changed, 13 insertions, 13 deletions
diff --git a/src/libjin/Audio/SDL/SDLSource.h b/src/libjin/Audio/SDL/SDLSource.h
index 9a3dd9b..dd792c7 100644
--- a/src/libjin/Audio/SDL/SDLSource.h
+++ b/src/libjin/Audio/SDL/SDLSource.h
@@ -45,7 +45,7 @@ namespace audio
inline void handle(SDLSourceManager* manager, SDLSourceCommand* cmd);
inline void process(void* buffer, size_t size);
- private:
+ protected:
SDLSource();
diff --git a/src/libjin/Graphics/Canvas.h b/src/libjin/Graphics/Canvas.h
index bccb3f6..0d5635e 100644
--- a/src/libjin/Graphics/Canvas.h
+++ b/src/libjin/Graphics/Canvas.h
@@ -22,7 +22,7 @@ namespace graphics
static bool hasbind(GLint fbo);
- private:
+ protected:
Canvas(int w, int h);
diff --git a/src/libjin/Graphics/JSL.h b/src/libjin/Graphics/JSL.h
index 3872802..df942fd 100644
--- a/src/libjin/Graphics/JSL.h
+++ b/src/libjin/Graphics/JSL.h
@@ -22,7 +22,7 @@ namespace graphics
static JSLProgram* createJSLProgram(const char* program);
- ~JSLProgram();
+ virtual ~JSLProgram();
inline void JSLProgram::use()
{
@@ -49,7 +49,7 @@ namespace graphics
return currentJSLProgram;
}
- private:
+ protected:
JSLProgram(const char* program);
diff --git a/src/libjin/Thread/Thread.cpp b/src/libjin/Thread/Thread.cpp
index 064d3db..2be44a1 100644
--- a/src/libjin/Thread/Thread.cpp
+++ b/src/libjin/Thread/Thread.cpp
@@ -253,7 +253,7 @@ namespace thread
mutex->unlock();
}
- void Thread::send(int slot, Variant value)
+ void Thread::send(int slot, const Variant& value)
{
lock();
common->set(slot, value);
diff --git a/src/libjin/Thread/Thread.h b/src/libjin/Thread/Thread.h
index 37c978d..5b74f23 100644
--- a/src/libjin/Thread/Thread.h
+++ b/src/libjin/Thread/Thread.h
@@ -102,7 +102,7 @@ namespace thread
~Thread();
bool start();
void wait();
- void send(int slot, Variant value);
+ void send(int slot, const Variant& value);
bool receive(int slot);
Variant fetch(int slot);
Variant demand(int slot);
@@ -112,7 +112,7 @@ namespace thread
void lock();
void unlock();
- private:
+ protected:
#if JIN_THREAD_SDL
SDL_Thread* handle; // SDL thread
#elif JIN_THREAD_CPP
diff --git a/src/libjin/Thread/thread.cpp b/src/libjin/Thread/thread.cpp
index 064d3db..2be44a1 100644
--- a/src/libjin/Thread/thread.cpp
+++ b/src/libjin/Thread/thread.cpp
@@ -253,7 +253,7 @@ namespace thread
mutex->unlock();
}
- void Thread::send(int slot, Variant value)
+ void Thread::send(int slot, const Variant& value)
{
lock();
common->set(slot, value);
diff --git a/src/libjin/Thread/thread.h b/src/libjin/Thread/thread.h
index 37c978d..5b74f23 100644
--- a/src/libjin/Thread/thread.h
+++ b/src/libjin/Thread/thread.h
@@ -102,7 +102,7 @@ namespace thread
~Thread();
bool start();
void wait();
- void send(int slot, Variant value);
+ void send(int slot, const Variant& value);
bool receive(int slot);
Variant fetch(int slot);
Variant demand(int slot);
@@ -112,7 +112,7 @@ namespace thread
void lock();
void unlock();
- private:
+ protected:
#if JIN_THREAD_SDL
SDL_Thread* handle; // SDL thread
#elif JIN_THREAD_CPP
diff --git a/src/libjin/thread/thread.cpp b/src/libjin/thread/thread.cpp
index 064d3db..2be44a1 100644
--- a/src/libjin/thread/thread.cpp
+++ b/src/libjin/thread/thread.cpp
@@ -253,7 +253,7 @@ namespace thread
mutex->unlock();
}
- void Thread::send(int slot, Variant value)
+ void Thread::send(int slot, const Variant& value)
{
lock();
common->set(slot, value);
diff --git a/src/libjin/thread/thread.h b/src/libjin/thread/thread.h
index 37c978d..5b74f23 100644
--- a/src/libjin/thread/thread.h
+++ b/src/libjin/thread/thread.h
@@ -102,7 +102,7 @@ namespace thread
~Thread();
bool start();
void wait();
- void send(int slot, Variant value);
+ void send(int slot, const Variant& value);
bool receive(int slot);
Variant fetch(int slot);
Variant demand(int slot);
@@ -112,7 +112,7 @@ namespace thread
void lock();
void unlock();
- private:
+ protected:
#if JIN_THREAD_SDL
SDL_Thread* handle; // SDL thread
#elif JIN_THREAD_CPP