diff options
author | Christoph Egger <Christoph.Egger@gmx.de> | 2008-11-01 18:41:44 +0100 |
---|---|---|
committer | Christoph Egger <Christoph.Egger@gmx.de> | 2008-11-01 18:41:44 +0100 |
commit | 58905d98572ab7078eda45bbb50fd1cbf900e7d2 (patch) | |
tree | e6731fb6ac94377b0dc2f5634f764506e1adf8e4 /src/SFML/System/Unix/.svn | |
parent | 9035708f4c5f7a78d8fb810e87e183fd61fd3350 (diff) |
* Removing .svn entries got in by accident
* Do repacking
Diffstat (limited to 'src/SFML/System/Unix/.svn')
-rw-r--r-- | src/SFML/System/Unix/.svn/all-wcprops | 29 | ||||
-rw-r--r-- | src/SFML/System/Unix/.svn/entries | 164 | ||||
-rw-r--r-- | src/SFML/System/Unix/.svn/format | 1 | ||||
-rw-r--r-- | src/SFML/System/Unix/.svn/text-base/Mutex.cpp.svn-base | 68 | ||||
-rw-r--r-- | src/SFML/System/Unix/.svn/text-base/Platform.cpp.svn-base | 58 | ||||
-rw-r--r-- | src/SFML/System/Unix/.svn/text-base/Platform.hpp.svn-base | 69 | ||||
-rw-r--r-- | src/SFML/System/Unix/.svn/text-base/Thread.cpp.svn-base | 146 |
7 files changed, 0 insertions, 535 deletions
diff --git a/src/SFML/System/Unix/.svn/all-wcprops b/src/SFML/System/Unix/.svn/all-wcprops deleted file mode 100644 index 6518700..0000000 --- a/src/SFML/System/Unix/.svn/all-wcprops +++ /dev/null @@ -1,29 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 47 -/svnroot/sfml/!svn/ver/383/src/SFML/System/Unix -END -Mutex.cpp -K 25 -svn:wc:ra_dav:version-url -V 57 -/svnroot/sfml/!svn/ver/196/src/SFML/System/Unix/Mutex.cpp -END -Platform.cpp -K 25 -svn:wc:ra_dav:version-url -V 60 -/svnroot/sfml/!svn/ver/198/src/SFML/System/Unix/Platform.cpp -END -Thread.cpp -K 25 -svn:wc:ra_dav:version-url -V 58 -/svnroot/sfml/!svn/ver/196/src/SFML/System/Unix/Thread.cpp -END -Platform.hpp -K 25 -svn:wc:ra_dav:version-url -V 60 -/svnroot/sfml/!svn/ver/198/src/SFML/System/Unix/Platform.hpp -END diff --git a/src/SFML/System/Unix/.svn/entries b/src/SFML/System/Unix/.svn/entries deleted file mode 100644 index 794973a..0000000 --- a/src/SFML/System/Unix/.svn/entries +++ /dev/null @@ -1,164 +0,0 @@ -9 - -dir -915 -https://sfml.svn.sourceforge.net/svnroot/sfml/src/SFML/System/Unix -https://sfml.svn.sourceforge.net/svnroot/sfml - - - -2007-12-26T07:14:50.320767Z -383 -laurentgom - - -svn:special svn:externals svn:needs-lock - - - - - - - - - - - -4e206d99-4929-0410-ac5d-dfc041789085 - -Mutex.cpp -file - - - - -2008-11-01T16:23:42.000000Z -84d64db7d4302542ea194de6be583d36 -2007-08-21T13:41:14.043800Z -196 -laurentgom - - - - - - - - - - - - - - - - - - - - - -2184 - -Platform.cpp -file - - - - -2008-11-01T16:23:42.000000Z -c5d9fd0489c65af705d35316e2f0b1ab -2007-08-21T17:42:51.205559Z -198 -laurentgom - - - - - - - - - - - - - - - - - - - - - -2035 - -Thread.cpp -file - - - - -2008-11-01T16:23:42.000000Z -6783b2b0c050678f81c4fa07d9ddb279 -2007-08-21T13:41:14.043800Z -196 -laurentgom - - - - - - - - - - - - - - - - - - - - - -4275 - -Platform.hpp -file - - - - -2008-11-01T16:23:42.000000Z -3a966e25ae57757c1911e519fd33bd3b -2007-08-21T17:42:51.205559Z -198 -laurentgom - - - - - - - - - - - - - - - - - - - - - -2318 - diff --git a/src/SFML/System/Unix/.svn/format b/src/SFML/System/Unix/.svn/format deleted file mode 100644 index ec63514..0000000 --- a/src/SFML/System/Unix/.svn/format +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/src/SFML/System/Unix/.svn/text-base/Mutex.cpp.svn-base b/src/SFML/System/Unix/.svn/text-base/Mutex.cpp.svn-base deleted file mode 100644 index 9614361..0000000 --- a/src/SFML/System/Unix/.svn/text-base/Mutex.cpp.svn-base +++ /dev/null @@ -1,68 +0,0 @@ -////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-// you must not claim that you wrote the original software.
-// If you use this software in a product, an acknowledgment
-// in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-// and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/System/Unix/Mutex.hpp>
-
-
-namespace sf
-{
-////////////////////////////////////////////////////////////
-/// Default constructor
-////////////////////////////////////////////////////////////
-Mutex::Mutex()
-{
- pthread_mutex_init(&myMutex, NULL);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Destructor
-////////////////////////////////////////////////////////////
-Mutex::~Mutex()
-{
- pthread_mutex_destroy(&myMutex);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Lock the mutex
-////////////////////////////////////////////////////////////
-void Mutex::Lock()
-{
- pthread_mutex_lock(&myMutex);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Unlock the mutex
-////////////////////////////////////////////////////////////
-void Mutex::Unlock()
-{
- pthread_mutex_unlock(&myMutex);
-}
-
-} // namespace sf
diff --git a/src/SFML/System/Unix/.svn/text-base/Platform.cpp.svn-base b/src/SFML/System/Unix/.svn/text-base/Platform.cpp.svn-base deleted file mode 100644 index 0149c36..0000000 --- a/src/SFML/System/Unix/.svn/text-base/Platform.cpp.svn-base +++ /dev/null @@ -1,58 +0,0 @@ -////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-// you must not claim that you wrote the original software.
-// If you use this software in a product, an acknowledgment
-// in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-// and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/System/Unix/Platform.hpp>
-#include <unistd.h>
-#include <sys/time.h>
-
-namespace sf
-{
-namespace priv
-{
-////////////////////////////////////////////////////////////
-/// Get the current system time
-////////////////////////////////////////////////////////////
-double Platform::GetSystemTime()
-{
- timeval Time = {0, 0};
- gettimeofday(&Time, NULL);
-
- return Time.tv_sec + Time.tv_usec / 1000000.;
-}
-
-
-////////////////////////////////////////////////////////////
-/// Suspend the execution of the current thread for a specified time
-////////////////////////////////////////////////////////////
-void Platform::Sleep(float Time)
-{
- usleep(static_cast<unsigned long>(Time * 1000000));
-}
-
-} // namespace priv
-
-} // namespace sf
diff --git a/src/SFML/System/Unix/.svn/text-base/Platform.hpp.svn-base b/src/SFML/System/Unix/.svn/text-base/Platform.hpp.svn-base deleted file mode 100644 index 0cd0990..0000000 --- a/src/SFML/System/Unix/.svn/text-base/Platform.hpp.svn-base +++ /dev/null @@ -1,69 +0,0 @@ -////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-// you must not claim that you wrote the original software.
-// If you use this software in a product, an acknowledgment
-// in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-// and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-#ifndef SFML_PLATFORMUNIX_HPP
-#define SFML_PLATFORMUNIX_HPP
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
-#include <vector>
-
-
-namespace sf
-{
-namespace priv
-{
-////////////////////////////////////////////////////////////
-/// Unix implementation fo Platform
-/// Give access to various global system functions
-////////////////////////////////////////////////////////////
-class Platform
-{
-public :
-
- ////////////////////////////////////////////////////////////
- /// Get the current system time
- ///
- /// \return System time, in seconds
- ///
- ////////////////////////////////////////////////////////////
- static double GetSystemTime();
-
- ////////////////////////////////////////////////////////////
- /// Suspend the execution of the current thread for a specified time
- ///
- /// \param Time : Time to sleep, in seconds
- ///
- ////////////////////////////////////////////////////////////
- static void Sleep(float Time);
-};
-
-} // namespace priv
-
-} // namespace sf
-
-
-#endif // SFML_PLATFORMUNIX_HPP
diff --git a/src/SFML/System/Unix/.svn/text-base/Thread.cpp.svn-base b/src/SFML/System/Unix/.svn/text-base/Thread.cpp.svn-base deleted file mode 100644 index 3268f61..0000000 --- a/src/SFML/System/Unix/.svn/text-base/Thread.cpp.svn-base +++ /dev/null @@ -1,146 +0,0 @@ -////////////////////////////////////////////////////////////
-//
-// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com)
-//
-// This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented;
-// you must not claim that you wrote the original software.
-// If you use this software in a product, an acknowledgment
-// in the product documentation would be appreciated but is not required.
-//
-// 2. Altered source versions must be plainly marked as such,
-// and must not be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source distribution.
-//
-////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////
-// Headers
-////////////////////////////////////////////////////////////
-#include <SFML/System/Unix/Thread.hpp>
-#include <iostream>
-
-
-namespace sf
-{
-////////////////////////////////////////////////////////////
-/// Default constructor
-////////////////////////////////////////////////////////////
-Thread::Thread() :
-myIsActive(false),
-myFunction(NULL),
-myUserData(NULL)
-{
-
-}
-
-
-////////////////////////////////////////////////////////////
-/// Construct the thread from a function pointer
-////////////////////////////////////////////////////////////
-Thread::Thread(Thread::FuncType Function, void* UserData) :
-myIsActive(false),
-myFunction(Function),
-myUserData(UserData)
-{
-
-}
-
-
-////////////////////////////////////////////////////////////
-/// Virtual destructor
-////////////////////////////////////////////////////////////
-Thread::~Thread()
-{
- // Wait for the thread to finish before destroying the instance
- if (myIsActive)
- Wait();
-}
-
-
-////////////////////////////////////////////////////////////
-/// Create and run the thread
-////////////////////////////////////////////////////////////
-void Thread::Launch()
-{
- // Create the thread
- myIsActive = true;
- int Error = pthread_create(&myThread, NULL, &Thread::ThreadFunc, this);
-
- // Error ?
- if (Error != 0)
- {
- std::cerr << "Failed to create thread" << std::endl;
- myIsActive = false;
- }
-}
-
-
-////////////////////////////////////////////////////////////
-/// Wait until the thread finishes
-////////////////////////////////////////////////////////////
-void Thread::Wait()
-{
- if (myIsActive)
- {
- // Wait for the thread to finish, no timeout
- pthread_join(myThread, NULL);
-
- // Reset the thread state
- myIsActive = false;
- }
-}
-
-
-////////////////////////////////////////////////////////////
-/// Terminate the thread
-/// Terminating a thread with this function is not safe,
-/// you should rather try to make the thread function
-/// terminate by itself
-////////////////////////////////////////////////////////////
-void Thread::Terminate()
-{
- if (myIsActive)
- {
- pthread_cancel(myThread);
- myIsActive = false;
- }
-}
-
-
-////////////////////////////////////////////////////////////
-/// Function called as the thread entry point
-////////////////////////////////////////////////////////////
-void Thread::Run()
-{
- if (myFunction)
- myFunction(myUserData);
-}
-
-
-////////////////////////////////////////////////////////////
-/// Actual thread entry point, dispatches to instances
-////////////////////////////////////////////////////////////
-void* Thread::ThreadFunc(void* UserData)
-{
- // The sfThread instance is stored in the user data
- Thread* ThreadToRun = reinterpret_cast<Thread*>(UserData);
-
- // Tell the thread to handle cancel requests immediatly
- pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
-
- // Forward to the instance
- ThreadToRun->Run();
-
- return NULL;
-}
-
-} // namespace sf
|