aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2007-11-15 21:43:26 +0000
committerMike Buland <eichlan@xagasoft.com>2007-11-15 21:43:26 +0000
commit305d608fe508b8e2c31df9282cc6f987260a76b1 (patch)
treedfd4b585721f5ee6552dd4c3a3637e3b65110756
parent60704e94fd8cea25a2b2947710a7ba3b675acb33 (diff)
downloadlibbu++-305d608fe508b8e2c31df9282cc6f987260a76b1.tar.gz
libbu++-305d608fe508b8e2c31df9282cc6f987260a76b1.tar.bz2
libbu++-305d608fe508b8e2c31df9282cc6f987260a76b1.tar.xz
libbu++-305d608fe508b8e2c31df9282cc6f987260a76b1.zip
Final changes moving to the actually liscense-ified version, plus I fixed a
compile error I introduced last commit.
-rw-r--r--Makefile7
-rw-r--r--Makefile.legacy7
-rwxr-xr-xmkincs.sh5
-rw-r--r--src/queue.cpp2
-rw-r--r--src/queue.h2
-rw-r--r--src/tests/atom.cpp2
-rw-r--r--src/unit/entities/unit9
7 files changed, 26 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 7e45c16..27e59f5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,10 @@
1#
2# Copyright (C) 2007 Xagasoft, All rights reserved.
3#
4# This file is part of the libbu++ library and is released under the
5# terms of the license contained in the file LICENSE.
6#
7
1.PHONY: build 8.PHONY: build
2 9
3build: 10build:
diff --git a/Makefile.legacy b/Makefile.legacy
index 0afb4a0..02c233e 100644
--- a/Makefile.legacy
+++ b/Makefile.legacy
@@ -1,3 +1,10 @@
1#
2# Copyright (C) 2007 Xagasoft, All rights reserved.
3#
4# This file is part of the libbu++ library and is released under the
5# terms of the license contained in the file LICENSE.
6#
7
1OBJS:=$(patsubst %.cpp,%.o,$(wildcard src/*.cpp)) 8OBJS:=$(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
2USRCS:=$(wildcard src/unit/*.cpp) 9USRCS:=$(wildcard src/unit/*.cpp)
3UOBJS:=$(patsubst %.cpp,%.o,$(USRCS)) 10UOBJS:=$(patsubst %.cpp,%.o,$(USRCS))
diff --git a/mkincs.sh b/mkincs.sh
deleted file mode 100755
index 6f72f89..0000000
--- a/mkincs.sh
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/bin/bash
2
3cd src/bu
4rm *
5for i in ../*.h; do ln -s $i; done
diff --git a/src/queue.cpp b/src/queue.cpp
index 2e4c684..c7aef2e 100644
--- a/src/queue.cpp
+++ b/src/queue.cpp
@@ -5,4 +5,4 @@
5 * terms of the license contained in the file LICENSE. 5 * terms of the license contained in the file LICENSE.
6 */ 6 */
7 7
8#include "queue.h" 8#include "bu/queue.h"
diff --git a/src/queue.h b/src/queue.h
index c555a8a..0fab474 100644
--- a/src/queue.h
+++ b/src/queue.h
@@ -8,6 +8,8 @@
8#ifndef BU_QUEUE_H 8#ifndef BU_QUEUE_H
9#define BU_QUEUE_H 9#define BU_QUEUE_H
10 10
11#include <memory>
12
11namespace Bu 13namespace Bu
12{ 14{
13 template<typename value, typename valuealloc = std::allocator<value> > 15 template<typename value, typename valuealloc = std::allocator<value> >
diff --git a/src/tests/atom.cpp b/src/tests/atom.cpp
index cd5c373..7b8228c 100644
--- a/src/tests/atom.cpp
+++ b/src/tests/atom.cpp
@@ -16,7 +16,7 @@ typedef struct bob
16int main() 16int main()
17{ 17{
18 Bu::Atom<int> aInt; 18 Bu::Atom<int> aInt;
19 Bu::Atom<char *> aStr; 19 Bu::Atom<const char *> aStr;
20 Bu::Atom<bob> aBob; 20 Bu::Atom<bob> aBob;
21 21
22 aBob = bob(); 22 aBob = bob();
diff --git a/src/unit/entities/unit b/src/unit/entities/unit
index 28db45f..ab0eed2 100644
--- a/src/unit/entities/unit
+++ b/src/unit/entities/unit
@@ -4,7 +4,14 @@
4 <file 4 <file
5 name="source" 5 name="source"
6 filename="{=name:%tolower}.cpp" 6 filename="{=name:%tolower}.cpp"
7>#include "bu/unitsuite.h" 7>/*
8 * Copyright (C) 2007 Xagasoft, All rights reserved.
9 *
10 * This file is part of the libbu++ library and is released under the
11 * terms of the license contained in the file LICENSE.
12 */
13
14#include "bu/unitsuite.h"
8 15
9class Unit : public Bu::UnitSuite 16class Unit : public Bu::UnitSuite
10{ 17{