diff options
| -rw-r--r-- | include/nbt_tags.h (renamed from include/libnbt.h) | 10 | ||||
| -rw-r--r-- | include/tagfwd.h | 2 | ||||
| -rw-r--r-- | src/tag_list.cpp | 2 | ||||
| -rw-r--r-- | src/value.cpp | 2 | ||||
| -rw-r--r-- | src/value_initializer.cpp | 2 | ||||
| -rw-r--r-- | test/nbttest.cpp | 2 |
6 files changed, 11 insertions, 9 deletions
diff --git a/include/libnbt.h b/include/nbt_tags.h index 9a2198778c..810bf0d661 100644 --- a/include/libnbt.h +++ b/include/nbt_tags.h @@ -17,13 +17,13 @@ * You should have received a copy of the GNU Lesser General Public License * along with libnbt++. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef LIBNBT_H_INCLUDED -#define LIBNBT_H_INCLUDED +#ifndef NBT_TAGS_H_INCLUDED +#define NBT_TAGS_H_INCLUDED #include "tag_primitive.h" #include "tag_string.h" -#include "tag_compound.h" -#include "tag_list.h" #include "tag_array.h" +#include "tag_list.h" +#include "tag_compound.h" -#endif // LIBNBT_H_INCLUDED +#endif // NBT_TAGS_H_INCLUDED diff --git a/include/tagfwd.h b/include/tagfwd.h index 98d75b8328..622e39d056 100644 --- a/include/tagfwd.h +++ b/include/tagfwd.h @@ -36,6 +36,8 @@ typedef tag_primitive<int64_t> tag_long; typedef tag_primitive<float> tag_float; typedef tag_primitive<double> tag_double; +class tag_string; + template<class T> class tag_array; typedef tag_array<int8_t> tag_byte_array; typedef tag_array<int32_t> tag_int_array; diff --git a/src/tag_list.cpp b/src/tag_list.cpp index e23f162eb2..7c7176835b 100644 --- a/src/tag_list.cpp +++ b/src/tag_list.cpp @@ -18,7 +18,7 @@ * along with libnbt++. If not, see <http://www.gnu.org/licenses/>. */ #include "tag_list.h" -#include "libnbt.h" +#include "nbt_tags.h" namespace nbt { diff --git a/src/value.cpp b/src/value.cpp index bba76b0c8b..4b3fa47678 100644 --- a/src/value.cpp +++ b/src/value.cpp @@ -18,7 +18,7 @@ * along with libnbt++. If not, see <http://www.gnu.org/licenses/>. */ #include "value.h" -#include "libnbt.h" +#include "nbt_tags.h" #include <typeinfo> namespace nbt diff --git a/src/value_initializer.cpp b/src/value_initializer.cpp index 468b46e99c..18a4f58d96 100644 --- a/src/value_initializer.cpp +++ b/src/value_initializer.cpp @@ -18,7 +18,7 @@ * along with libnbt++. If not, see <http://www.gnu.org/licenses/>. */ #include "value_initializer.h" -#include "libnbt.h" +#include "nbt_tags.h" namespace nbt { diff --git a/test/nbttest.cpp b/test/nbttest.cpp index dc29d1a6ed..4bd9cd005d 100644 --- a/test/nbttest.cpp +++ b/test/nbttest.cpp @@ -18,7 +18,7 @@ * along with libnbt++. If not, see <http://www.gnu.org/licenses/>. */ #include "microtest.h" -#include "libnbt.h" +#include "nbt_tags.h" #include <algorithm> using namespace nbt; |