diff options
| author | Mark Spruiell <mes@zeroc.com> | 2016-10-11 10:54:49 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2016-10-11 10:54:49 -0700 |
| commit | e23e52c705c6046eda2303c39504a7f40ee7a930 (patch) | |
| tree | 497e085747eae0bcd7d86f1650216ba984b9190f /cpp/src/slice2confluence | |
| parent | Fixed typo (diff) | |
| download | ice-e23e52c705c6046eda2303c39504a7f40ee7a930.tar.bz2 ice-e23e52c705c6046eda2303c39504a7f40ee7a930.tar.xz ice-e23e52c705c6046eda2303c39504a7f40ee7a930.zip | |
slice2confluence fixes
Diffstat (limited to 'cpp/src/slice2confluence')
| -rw-r--r-- | cpp/src/slice2confluence/Gen.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Makefile.mak | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp index 98234547210..a1f05453892 100644 --- a/cpp/src/slice2confluence/Gen.cpp +++ b/cpp/src/slice2confluence/Gen.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceUtil/FileUtil.h> #include <IceUtil/Functional.h> #include <IceUtil/StringUtil.h> #include <Slice/FileTracker.h> @@ -1804,7 +1805,7 @@ Slice::GeneratorBase::makeDir(const string& dir) string Slice::GeneratorBase::readFile(const string& file) { - ifstream in(file.c_str()); + std::ifstream in(file.c_str()); if(!in) { ostringstream os; @@ -1840,7 +1841,7 @@ Slice::GeneratorBase::getFooter(const string& footer) void Slice::GeneratorBase::readFile(const string& file, string& part1, string& part2) { - ifstream in(file.c_str()); + std::ifstream in(file.c_str()); if(!in) { ostringstream os; diff --git a/cpp/src/slice2confluence/Makefile b/cpp/src/slice2confluence/Makefile index 2bef9175f5d..c667972d4da 100644 --- a/cpp/src/slice2confluence/Makefile +++ b/cpp/src/slice2confluence/Makefile @@ -21,7 +21,7 @@ RPATH_DIR = $(LOADER_PATH)/../$(libsubdir) include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I. $(CPPFLAGS) +CPPFLAGS := -I. -I.. $(CPPFLAGS) $(NAME): $(OBJS) rm -f $@ diff --git a/cpp/src/slice2confluence/Makefile.mak b/cpp/src/slice2confluence/Makefile.mak index 4213b5f2bca..9fd7086f214 100644 --- a/cpp/src/slice2confluence/Makefile.mak +++ b/cpp/src/slice2confluence/Makefile.mak @@ -19,7 +19,7 @@ OBJS = .\ConfluenceOutput.obj \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN +CPPFLAGS = -I. -I.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN !if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(NAME:.exe=.pdb) |