Skip to content

Commit

Permalink
Merge pull request #1 in BSP/bsp-library from General-Optimisation to…
Browse files Browse the repository at this point in the history
… master

* commit 'ac950e87dcaebee25aca8222f124fd08a8ed9a78':
  Fixed warning
  Fixes
  Double buffered sync booleans
  fixed gcc warning
  Update README.md
  fixed headers & osx TLS fix
  Optimisation proposal
  • Loading branch information
pevisscher committed Dec 19, 2015
2 parents 4e40030 + ac950e8 commit d14a5e8
Show file tree
Hide file tree
Showing 17 changed files with 241 additions and 148 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ void main( int32_t, const char ** )
{
BSPLib::Excute( []
{
std::cout << "Hello BSP Worldwide from process " << BSPLib::Classic::ProcId()
std::cout << "Hello BSP Worldwide from process " << BSPLib::ProcId()
<< " of " << BSPLib::NProcs() << std::endl;
}, BSPLib::NProcs() );
}
Expand Down Expand Up @@ -149,4 +149,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
```
```
4 changes: 2 additions & 2 deletions bsp/include/bsp/barrier.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
* THE SOFTWARE.
*/
#pragma once
#ifndef __BARRIER_H__
#define __BARRIER_H__
#ifndef __BSPLIB_BARRIER_H__
#define __BSPLIB_BARRIER_H__

#include "bsp/bspAbort.h"

Expand Down
4 changes: 2 additions & 2 deletions bsp/include/bsp/bsp.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
* THE SOFTWARE.
*/
#pragma once
#ifndef __BSP_H__
#define __BSP_H__
#ifndef __BSPLIB_BSP_H__
#define __BSPLIB_BSP_H__

#ifndef DEBUG
# define BSP_SKIP_CHECKS
Expand Down
4 changes: 2 additions & 2 deletions bsp/include/bsp/bspAbort.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
* THE SOFTWARE.
*/
#pragma once
#ifndef __BSPABORT_H__
#define __BSPABORT_H__
#ifndef __BSPLIB_BSPABORT_H__
#define __BSPLIB_BSPABORT_H__

#include <exception>
#include <string>
Expand Down

0 comments on commit d14a5e8

Please sign in to comment.