summaryrefslogtreecommitdiff
path: root/cpp/include/Slice
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-01-14 09:22:33 +0100
committerJose <jose@zeroc.com>2015-01-14 09:22:33 +0100
commit195454df0895051579cd83d6e64d2308a8f42c16 (patch)
tree6527548e026a929f410aef51ad467b26c4e8bf2c /cpp/include/Slice
parentFix another bug with hello demos. (diff)
downloadice-195454df0895051579cd83d6e64d2308a8f42c16.tar.bz2
ice-195454df0895051579cd83d6e64d2308a8f42c16.tar.xz
ice-195454df0895051579cd83d6e64d2308a8f42c16.zip
JavaScript updates to use gulp and add npm and bower packages
Diffstat (limited to 'cpp/include/Slice')
-rw-r--r--cpp/include/Slice/Preprocessor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h
index 6667189aec1..df17ead72e7 100644
--- a/cpp/include/Slice/Preprocessor.h
+++ b/cpp/include/Slice/Preprocessor.h
@@ -39,7 +39,7 @@ public:
FILE* preprocess(bool, const std::string& = "");
bool close();
- enum Language { CPlusPlus, Java, JavaXML, CSharp, Python, Ruby, PHP, JS, ObjC };
+ enum Language { CPlusPlus, Java, JavaXML, CSharp, Python, Ruby, PHP, JavaScript, JavaScriptJSON, ObjC };
bool printMakefileDependencies(Language, const std::vector<std::string>&, const std::string& = "", const std::string& = "cpp",
const std::string& = "");